|
From: Ben G. <s_a...@us...> - 2004-04-23 08:10:19
|
Update of /cvsroot/opentnl/tnl/zap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14372/zap Modified Files: CTFGame.cpp UIMenus.cpp UIMenus.h ZAP.vcproj masterConnection.cpp quickChat.cpp ship.cpp Log Message: Variety of small fixes and formats, but crash bug remains. Index: quickChat.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/quickChat.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** quickChat.cpp 23 Apr 2004 02:14:29 -0000 1.4 --- quickChat.cpp 23 Apr 2004 08:10:03 -0000 1.5 *************** *** 53,60 **** {2, 'N', true, "Target needed", "I need a target."}, {2, 'O', true, "Target out of range", "Target is out of range."}, ! {2, 'D', true, "Destroy Enemy Generator", "Destroy the enemy generator."}, {2, 'E', true, "Enemy Generator Destroyed", "Enemy generator is destroyed."}, {2, 'T', true, "Destroy Enemy Turret", "Destroy enemy turret."}, ! {2, 'S', true, "Enemy Turret Destroyed", "Enemy turret destroyed."}, {1, 'D', true, "Defense", ""}, {2, 'I', true, "Incoming Enemies", "Incoming enemies!"}, --- 53,60 ---- {2, 'N', true, "Target needed", "I need a target."}, {2, 'O', true, "Target out of range", "Target is out of range."}, ! /* {2, 'D', true, "Destroy Enemy Generator", "Destroy the enemy generator."}, {2, 'E', true, "Enemy Generator Destroyed", "Enemy generator is destroyed."}, {2, 'T', true, "Destroy Enemy Turret", "Destroy enemy turret."}, ! {2, 'S', true, "Enemy Turret Destroyed", "Enemy turret destroyed."}, */ {1, 'D', true, "Defense", ""}, {2, 'I', true, "Incoming Enemies", "Incoming enemies!"}, *************** *** 75,89 **** {2, 'R', true, "Return our flag", "Return our flag to base."}, {2, 'F', true, "Get enemy flag", "Get the enemy flag."}, ! {2, 'M', true, "Flag mined", "Our flag is mined."}, ! {2, 'C', true, "Clear mines", "Clear the mines from our flag."}, ! {2, 'D', true, "Mines cleared", "Mines have been cleared."}, ! {2, 'N', true, "Mine flag", "Mine the flag."}, ! {1, 'R', true, "Need", ""}, {2, 'R', true, "Need Repairs", "Need repairs."}, ! {2, 'A', true, "Need APC Pickup", "I need an APC pickup."}, {2, 'E', true, "Need Escort", "I need an escort back to base."}, ! {2, 'T', true, "Need Ammo", "Can anyone bring me some ammo?"}, {1, 'E', true, "Team", ""}, ! {2, 'W', true, "Watch Shooting", "Watch where your shooting!"}, {2, 'D', true, "Dont know", "I don't know."}, {2, 'Y', true, "Yes", "Yes."}, --- 75,89 ---- {2, 'R', true, "Return our flag", "Return our flag to base."}, {2, 'F', true, "Get enemy flag", "Get the enemy flag."}, ! // {2, 'M', true, "Flag mined", "Our flag is mined."}, ! // {2, 'C', true, "Clear mines", "Clear the mines from our flag."}, ! // {2, 'D', true, "Mines cleared", "Mines have been cleared."}, ! // {2, 'N', true, "Mine flag", "Mine the flag."}, ! {1, 'N', true, "Need", ""}, {2, 'R', true, "Need Repairs", "Need repairs."}, ! // {2, 'A', true, "Need APC Pickup", "I need an APC pickup."}, {2, 'E', true, "Need Escort", "I need an escort back to base."}, ! // {2, 'T', true, "Need Ammo", "Can anyone bring me some ammo?"}, {1, 'E', true, "Team", ""}, ! {2, 'W', true, "Watch Shooting", "Watch where you're shooting!"}, {2, 'D', true, "Dont know", "I don't know."}, {2, 'Y', true, "Yes", "Yes."}, *************** *** 104,116 **** {1, 'S', true, "Incoming Enemies - Direction", ""}, {2, 'W', true, "Incoming North", "*** INCOMING NORTH ***"}, ! {2, 'A', true, "Incoming West", "*** INCOMING WEST ***"}, ! {2, 'S', true, "Incoming East", "*** INCOMING EAST ***"}, {2, 'Z', true, "Incoming South", "*** INCOMING SOUTH ***"}, - {2, 'D', true, "Incoming HEAVIES", "*** INCOMING HEAVIES ***"}, {1, 'G', true, "Global", ""}, {2, 'Z', false, "Doh", "Doh!"}, {2, 'O', false, "Oops", "Oops!"}, {2, 'F', false, "Shazbot", "Shazbot!"}, ! {2, 'Q', false, "Damnit", "Damnit!"}, {2, 'C', false, "Crap", "Ah Crap!"}, {2, 'E', false, "Duh", "Duh."}, --- 104,115 ---- {1, 'S', true, "Incoming Enemies - Direction", ""}, {2, 'W', true, "Incoming North", "*** INCOMING NORTH ***"}, ! {2, 'A', true, "Incoming West", "*** INCOMING WEST ***"}, ! {2, 'S', true, "Incoming East", "*** INCOMING EAST ***"}, {2, 'Z', true, "Incoming South", "*** INCOMING SOUTH ***"}, {1, 'G', true, "Global", ""}, {2, 'Z', false, "Doh", "Doh!"}, {2, 'O', false, "Oops", "Oops!"}, {2, 'F', false, "Shazbot", "Shazbot!"}, ! {2, 'Q', false, "Damnit", "Dammit!"}, {2, 'C', false, "Crap", "Ah Crap!"}, {2, 'E', false, "Duh", "Duh."}, Index: UIMenus.h =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/UIMenus.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UIMenus.h 21 Apr 2004 20:19:07 -0000 1.2 --- UIMenus.h 23 Apr 2004 08:10:03 -0000 1.3 *************** *** 74,78 **** static bool controlsRelative; static bool fullscreen; - static bool showNames; OptionsMenuUserInterface(); --- 74,77 ---- Index: ZAP.vcproj =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/ZAP.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ZAP.vcproj 23 Apr 2004 01:49:46 -0000 1.3 --- ZAP.vcproj 23 Apr 2004 08:10:03 -0000 1.4 *************** *** 71,74 **** --- 71,75 ---- <Tool Name="VCCLCompilerTool" + OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="../tnl;../glut;../openal" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" Index: UIMenus.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/UIMenus.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UIMenus.cpp 23 Apr 2004 01:49:46 -0000 1.4 --- UIMenus.cpp 23 Apr 2004 08:10:03 -0000 1.5 *************** *** 168,172 **** bool OptionsMenuUserInterface::controlsRelative = false; bool OptionsMenuUserInterface::fullscreen = false; - bool OptionsMenuUserInterface::showNames = false; OptionsMenuUserInterface::OptionsMenuUserInterface() --- 168,171 ---- *************** *** 195,203 **** menuItems.push_back("SET FULLSCREEN MODE"); - if(showNames) - menuItems.push_back("SET NAMES HIDDEN"); - else - menuItems.push_back("SET NAMES VISIBLE"); - if(gClientGame->getConnectionToServer()) menuItems.push_back("RETURN TO GAME"); --- 194,197 ---- *************** *** 244,250 **** break; case 2: - showNames = !showNames; - break; - case 3: if(gClientGame->getConnectionToServer()) gGameUserInterface.activate(); --- 238,241 ---- Index: masterConnection.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/masterConnection.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** masterConnection.cpp 23 Apr 2004 01:49:46 -0000 1.4 --- masterConnection.cpp 23 Apr 2004 08:10:03 -0000 1.5 *************** *** 182,186 **** Parent::writeConnectRequest(bstream); ! bstream->writeString("ZAP1.2"); // Game Name if(bstream->writeFlag(mIsGameServer)) { --- 182,186 ---- Parent::writeConnectRequest(bstream); ! bstream->writeString("ZAP1.3"); // Game Name if(bstream->writeFlag(mIsGameServer)) { Index: CTFGame.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/CTFGame.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CTFGame.cpp 23 Apr 2004 07:02:25 -0000 1.11 --- CTFGame.cpp 23 Apr 2004 08:10:02 -0000 1.12 *************** *** 238,241 **** --- 238,245 ---- GameConnection *controlConnection = theShip->getControllingClient(); + + if(!controlConnection) + return 0; + S32 clientIndex = findClientIndexByConnection(controlConnection); Index: ship.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/ship.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ship.cpp 23 Apr 2004 01:49:46 -0000 1.9 --- ship.cpp 23 Apr 2004 08:10:03 -0000 1.10 *************** *** 578,582 **** // Render name... ! if(gClientGame->getConnectionToServer()->getControlObject() != this) //OptionsMenuUserInterface::showNames) { static char buff[255]; --- 578,582 ---- // Render name... ! if(gClientGame->getConnectionToServer()->getControlObject() != this) { static char buff[255]; |