- Timestamp:
- Jan 11, 2006, 3:35:24 PM (19 years ago)
- Location:
- branches/network/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/coord/p_node.cc
r6469 r6483 1039 1039 SYNCHELP_READ_FKT( BaseObject::writeState ); 1040 1040 1041 //PRINTF(0)("name = %s\n", this->getName());1042 1043 1041 char * parentName = NULL; 1044 1042 SYNCHELP_READ_STRINGM( parentName ); … … 1065 1063 SYNCHELP_READ_FLOAT( f3 ); 1066 1064 this->setRelCoor( f1, f2, f3 ); 1067 //this->setRelCoor( 10, 0, 0 );1068 1069 SYNCHELP_READ_FLOAT( f1 );1065 //this->setRelCoor( 5, 0, 0 ); 1066 1067 /*SYNCHELP_READ_FLOAT( f1 ); 1070 1068 SYNCHELP_READ_FLOAT( f2 ); 1071 SYNCHELP_READ_FLOAT( f3 ); 1069 SYNCHELP_READ_FLOAT( f3 );*/ 1072 1070 //this->setAbsCoor( f1, f2, f3 ); 1073 1071 … … 1078 1076 this->setRelDir( Quaternion( Vector(f2, f3, f4), f1 ) ); 1079 1077 1080 SYNCHELP_READ_FLOAT( f1 );1078 /*SYNCHELP_READ_FLOAT( f1 ); 1081 1079 SYNCHELP_READ_FLOAT( f2 ); 1082 1080 SYNCHELP_READ_FLOAT( f3 ); 1083 SYNCHELP_READ_FLOAT( f4 ); 1081 SYNCHELP_READ_FLOAT( f4 );*/ 1084 1082 //this->setAbsDir( Quaternion( Vector(f2, f3, f4), f1 ) ); 1085 1083 … … 1113 1111 SYNCHELP_WRITE_FKT( BaseObject::readState ); 1114 1112 1115 //PRINTF(0)("name = %s\n", this->getName());1116 1117 1113 if ( this->parent ) 1118 1114 { … … 1132 1128 //PRINTF(0)("%s, %f, %f, %f\n", getClassName(), relCoordinate.x, relCoordinate.y, relCoordinate.z); 1133 1129 1134 SYNCHELP_WRITE_FLOAT( this->absCoordinate.x );1130 /*SYNCHELP_WRITE_FLOAT( this->absCoordinate.x ); 1135 1131 SYNCHELP_WRITE_FLOAT( this->absCoordinate.y ); 1136 SYNCHELP_WRITE_FLOAT( this->absCoordinate.z ); 1132 SYNCHELP_WRITE_FLOAT( this->absCoordinate.z );*/ 1137 1133 1138 1134 //PRINTF(0)("%s, %f, %f, %f\n", getClassName(), absCoordinate.x, absCoordinate.y, absCoordinate.z); … … 1143 1139 SYNCHELP_WRITE_FLOAT( this->relDirection.v.z ); 1144 1140 1145 SYNCHELP_WRITE_FLOAT( this->absDirection.w );1141 /*SYNCHELP_WRITE_FLOAT( this->absDirection.w ); 1146 1142 SYNCHELP_WRITE_FLOAT( this->absDirection.v.x ); 1147 1143 SYNCHELP_WRITE_FLOAT( this->absDirection.v.y ); 1148 SYNCHELP_WRITE_FLOAT( this->absDirection.v.z ); 1144 SYNCHELP_WRITE_FLOAT( this->absDirection.v.z );*/ 1149 1145 1150 1146 int n = children.size(); … … 1155 1151 SYNCHELP_WRITE_STRING( (*it)->getName() ); 1156 1152 } 1153 1157 1154 return SYNCHELP_WRITE_N; 1158 1155 } -
branches/network/src/lib/lang/base_object.cc
r6341 r6483 199 199 } 200 200 SYNCHELP_READ_STRINGM( this->objectName ); 201 if ( this->objectName && !strcmp(this->objectName, "") ) 202 { 203 delete[] this->objectName; 204 this->objectName = NULL; 205 } 201 206 202 207 return SYNCHELP_READ_N; -
branches/network/src/lib/network/network_game_manager.cc
r6469 r6483 164 164 SYNCHELP_WRITE_BYTE( b ); 165 165 hasRequestedWorld = true; 166 PRINTF(0)("the world is enough! id=%d\n", this->getUniqueID());167 166 return SYNCHELP_WRITE_N; 168 167 } … … 462 461 PRINTF(0)("Fabricated %s with id %d\n", s->getClassName(), s->getUniqueID()); 463 462 464 // NOTE: hack to prevent collision463 //HACK: hack to prevent collision 465 464 if ( b->isA(CL_WORLD_ENTITY) ) 466 465 { -
branches/network/src/lib/network/network_stream.cc
r6469 r6483 166 166 networkSockets[0]->destroy(); 167 167 networkSockets[0] = NULL; 168 //TODO: delete handshake from synchronizeable list so i can delete it 168 169 169 if ( handshakes[0] ) 170 170 delete handshakes[0]; … … 252 252 if ( networkSockets[reciever] != NULL ) 253 253 { 254 PRINTF( 0)("write %d bytes to socket %d\n", dataLength, reciever);254 PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever); 255 255 networkSockets[reciever]->writePacket(downBuffer, dataLength); 256 256 } … … 266 266 if ( networkSockets[i] != NULL ) 267 267 { 268 PRINTF( 0)("write %d bytes to socket %d\n", dataLength, reciever);268 PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever); 269 269 networkSockets[i]->writePacket(downBuffer, dataLength); 270 270 } … … 372 372 networkSockets[i]->destroy(); 373 373 networkSockets[i] = NULL; 374 //TODO: delete handshake from synchronizeable list so i can delete it 374 375 375 if ( handshakes[i] ) 376 376 delete handshakes[i]; -
branches/network/src/world_entities/skybox.cc
r6469 r6483 250 250 if ( rec > 0 ) 251 251 { 252 PRINT(0)("SEND DATA: size=%f texture='%s'\n", size, textureName);253 252 *reciever = rec; 254 253 -
branches/network/src/world_entities/space_ships/space_ship.cc
r6469 r6483 574 574 SYNCHELP_READ_FLOAT( xMouse ); 575 575 SYNCHELP_READ_FLOAT( yMouse ); 576 SYNCHELP_READ_FLOAT( mouseSensitivity ); //TODO: remove this two lines576 SYNCHELP_READ_FLOAT( mouseSensitivity ); 577 577 SYNCHELP_READ_FLOAT( cycle ); 578 578 } … … 609 609 *reciever = 0; 610 610 611 if ( this->getHostID() !=this->getOwner() )611 if ( this->getHostID()==this->getOwner() ) 612 612 { 613 613 int mask = 0; … … 630 630 mask |= MASK_bRollR; 631 631 632 static int oldMask = mask+1; //so it i tdifferent the first time!632 static int oldMask = mask+1; //so it is different the first time! 633 633 static float oldxMouse = xMouse + 1.0; 634 634 static float oldyMouse = yMouse + 1.0; … … 649 649 SYNCHELP_WRITE_FLOAT( yMouse ); 650 650 SYNCHELP_WRITE_FLOAT( mouseSensitivity ); 651 SYNCHELP_WRITE_FLOAT( cycle ); //TODO: remove this two lines651 SYNCHELP_WRITE_FLOAT( cycle ); 652 652 } 653 653 }
Note: See TracChangeset
for help on using the changeset viewer.