Changeset 533

Timestamp:

07/03/12 21:18:53 (11 months ago)

Author:

sirlemonhead

Message:

- added LogDebugString() to replace calls to OutputDebugString()

Location:

branches/workbranch/trunk

Files:

• 3dc/RimLoader.cpp (modified) (2 diffs)
• 3dc/RingBuffer.cpp (modified) (2 diffs)
• 3dc/avp/BH_ALIEN.cpp (modified) (1 diff)
• 3dc/avp/CDTrackSelection.cpp (modified) (1 diff)
• 3dc/avp/Hud.cpp (modified) (2 diffs)
• 3dc/avp/win95/Projload.cpp (modified) (3 diffs)
• 3dc/avp/win95/USR_IO.cpp (modified) (21 diffs)
• 3dc/avp/win95/winmain.cpp (modified) (9 diffs)
• 3dc/d3d_render.cpp (modified) (9 diffs)
• 3dc/logString.cpp (modified) (2 diffs)
• 3dc/logstring.h (modified) (1 diff)
• 3dc/utilities.cpp (modified) (2 diffs)
• 3dc/win95/CD_player.cpp (modified) (30 diffs)
• 3dc/win95/CD_player.h (modified) (7 diffs)
• 3dc/win95/VideoModes.cpp (modified) (2 diffs)
• 3dc/win95/chnkload.cpp (modified) (1 diff)
• 3dc/win95/huffman.cpp (modified) (19 diffs)
• tools/installer/avpx.iss (modified) (2 diffs)
• win32/Di_func.cpp (modified) (7 diffs)
• win32/VS2010/AvP.vcxproj (modified) (2 diffs)
• win32/d3_func.cpp (modified) (24 diffs)

branches/workbranch/trunk/3dc/RimLoader.cpp

@@ -56 +56 @@
 bool RimLoader::Decode(uint8_t *dest, uint32_t destPitch)
 {
-        if (!dest)
+        if (!dest) {
                 return false;
+        }
 
         this->dest = dest;
@@ -261 +262 @@
 
 /*
-        after parsing and uncompacting if necessary, you will have N planes of pixel data.  Color register used for 
-        each pixel is specified by looking at each pixel thru the planes.  I.e., if you have 5 planes, and the bit for 
-        a particular pixel is set in planes 
+        after parsing and uncompacting if necessary, you will have N planes of pixel data.  Color register used for
+        each pixel is specified by looking at each pixel thru the planes.  I.e., if you have 5 planes, and the bit for
+        a particular pixel is set in planes
         0 and 3:
 

branches/workbranch/trunk/3dc/RingBuffer.cpp

@@ -106 +106 @@
                 // standard logic - buffers have a gap, work out readable space between them
                 readableSpace = writePos - readPos;
-                if (readableSpace < 0)
+                if (readableSpace < 0) {
                         readableSpace += bufferCapacity;
+                }
         }
 
@@ -185 +186 @@
 
         // is first size big enough to hold all our data?
-        if (firstSize > srcDataSize)
+        if (firstSize > srcDataSize) {
                 firstSize = srcDataSize;
+        }
 
         // first part. from write cursor to end of buffer

branches/workbranch/trunk/3dc/avp/BH_ALIEN.cpp

@@ -1948 +1948 @@
                         {
                                 /* More complex.  Affected by alien type and health. */
-                                NPC_DATA *NpcData;
+                                NPC_DATA *NpcData = 0;
                                 int prefactor;
 

branches/workbranch/trunk/3dc/avp/CDTrackSelection.cpp

@@ -87 +87 @@
 
                         // skip to the next non numerical character
-                        while (*buffer>='0' && *buffer<='9') {
+                        while (*buffer >= '0' && *buffer <= '9') {
                                 buffer++;
                         }

branches/workbranch/trunk/3dc/avp/Hud.cpp

@@ -47 +47 @@
 #include "language.h"
 #include "tables.h"
+#include "assert.h"
 
 #define DO_PREDATOR_OVERLAY FALSE
@@ -2052 +2053 @@
         while (CameraZoomScale<=ZoomLevels[++i]);
 
+        assert(i < 4);
+
         deltaZoom = (ZoomLevels[i-1] - ZoomLevels[i])*(float)NormalFrameTime/32768.0f;
 //      textprint("deltaZoom %f, zone %d\n",deltaZoom,i);

branches/workbranch/trunk/3dc/avp/win95/Projload.cpp

@@ -78 +78 @@
 
 // these are to link with chnkimag.cpp
-const char * ToolsTex_Directory = "//Kate/Kate Share/avp/ToolsTex/";
-const char * GenTex_Directory = "//Kate/Kate Share/avp/GenG-Tex/";
-const char * SubShps_Directory = "SubShps/All/";
+const char *ToolsTex_Directory = "//Kate/Kate Share/avp/ToolsTex/";
+const char *GenTex_Directory = "//Kate/Kate Share/avp/GenG-Tex/";
+const char *SubShps_Directory = "SubShps/All/";
 // const char * GenTex_Directory = 0;
-const char * FixTex_Directory = "//Kate/Kate Share/avp/Fix-Tex/";
-const char * GameTex_Directory = "//Kate/Kate Share/avp/game-tex/";
+const char *FixTex_Directory = "//Kate/Kate Share/avp/Fix-Tex/";
+const char *GameTex_Directory = "//Kate/Kate Share/avp/game-tex/";
 // new directories for new-style graphics - to be determined properly
-char const * FirstTex_Directory = "Graphics"; // currently relative to cwd
-char const * SecondTex_Directory = 0; // will be the src safe shadow for development builds
+char const *FirstTex_Directory = "Graphics"; // currently relative to cwd
+char const *SecondTex_Directory = 0; // will be the src safe shadow for development builds
                                                                 //used for cd graphics directory in final version
 
-char* Rif_Sound_Directory = 0;//set for the main level rif
-
-static char * light_set_name = "NORMALLT";
-
-static Object_Chunk * * o_chunk_array;
-static int * aimodule_indeces; //array parallel to o_chunk_array
-
-
-void setup_preplaced_decals(File_Chunk* fc,Environment_Data_Chunk* edc);
+char *Rif_Sound_Directory = 0;//set for the main level rif
+
+static char *light_set_name = "NORMALLT";
+
+static Object_Chunk **o_chunk_array;
+static int *aimodule_indeces; //array parallel to o_chunk_array
+
+
+void setup_preplaced_decals(File_Chunk *fc, Environment_Data_Chunk *edc);
 /////////////////////////////////////////
 // Functions which operate on RIFFHANDLEs
@@ -104 +104 @@
 void setup_start_position(RIFFHANDLE h)
 {
-        Chunk * pChunk = h->envd->lookup_single_child("SPECLOBJ");
-        AVP_Player_Start_Chunk* start_chunk=0;
+        Chunk *pChunk = h->envd->lookup_single_child("SPECLOBJ");
+        AVP_Player_Start_Chunk *start_chunk = 0;
         if (pChunk)
         {
@@ -276 +276 @@
         }
         int aimodule_index=aimodule_indeces[module_index];
-
 
         PATHHEADER* path=&PathArray[path_index];

branches/workbranch/trunk/3dc/avp/win95/USR_IO.cpp

@@ -35 +35 @@
 void MaintainZoomingLevel(void);
 
+// Extern for global keyboard buffer
+extern unsigned char KeyboardInput[];
+extern unsigned char DebouncedKeyboardInput[];
+extern int GotJoystick;
+extern bool GotMouse;
+extern BOOL GotXPad;
+
+// XInput value externs
+extern int xPadLookX;
+extern int xPadLookY;
+extern int xPadMoveX;
+extern int xPadMoveY;
+
+extern int CameraZoomLevel;
+extern int MouseVelX;
+extern int MouseVelY;
+extern JOYINFOEX JoystickData;
+extern JOYCAPS JoystickCaps;
+
+extern void save_preplaced_decals();
+
 FIXED_INPUT_CONFIGURATION FixedInputConfig =
 {
@@ -48 +69 @@
         KEY_0,                          // Weapon10;
         KEY_ESCAPE,                     // PauseGame;
-
 };
 
@@ -1016 +1036 @@
 };
 
-/* Extern for global keyboard buffer */
-extern unsigned char KeyboardInput[];
-extern unsigned char DebouncedKeyboardInput[];
-extern int GotJoystick;
-extern int GotMouse;
-extern BOOL GotXPad;
-
-/* XInput value externs */
-extern int xPadLookX;
-extern int xPadLookY;
-extern int xPadMoveX;
-extern int xPadMoveY;
-
 /* initialise the player input structure(s) in the player_status block */
 void InitPlayerGameInput(STRATEGYBLOCK* sbPtr)
@@ -1034 +1041 @@
         PLAYER_STATUS *playerStatusPtr;
 
-    /* get the player status block ... */
-    playerStatusPtr = (PLAYER_STATUS *) (sbPtr->SBdataptr);
-    LOCALASSERT(playerStatusPtr);
-        
+        /* get the player status block ... */
+        playerStatusPtr = (PLAYER_STATUS *) (sbPtr->SBdataptr);
+        LOCALASSERT(playerStatusPtr);
 
         /* analogue type inputs */
@@ -1053 +1059 @@
         /* KJL 14:23:54 8/7/97 - default to run */
         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_Faster = 1;
-
 }
 
@@ -1066 +1071 @@
         PLAYER_STATUS *playerStatusPtr;
 
-    /* get the player status block ... */
-    playerStatusPtr = (PLAYER_STATUS *) (sbPtr->SBdataptr);
-    LOCALASSERT(playerStatusPtr);
+        /* get the player status block ... */
+        playerStatusPtr = (PLAYER_STATUS *) (sbPtr->SBdataptr);
+        LOCALASSERT(playerStatusPtr);
         
         /* start off by initialising the inputs */
@@ -1097 +1102 @@
         if (IOFOCUS_AcceptControls() && !InGameMenusAreRunning() && (!(IOFOCUS_Get() & IOFOCUS_NEWCONSOLE)))
         {
-                /* now do forward,backward,left,right,up and down 
-                   IMPORTANT:  The request flag and the movement 
+                /* now do forward,backward,left,right,up and down
+                   IMPORTANT:  The request flag and the movement
                    increment must BOTH be set!
                 */
@@ -1105 +1110 @@
                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_Forward = 1;
                         playerStatusPtr->Mvt_MotionIncrement = ONE_FIXED;
-                }       
+                }
                 if (KeyboardInput[primaryInput->Backward] || KeyboardInput[secondaryInput->Backward])
                 {
@@ -1127 +1132 @@
                 }
                 if (KeyboardInput[primaryInput->StrafeRight] || KeyboardInput[secondaryInput->StrafeRight])
-                {       
+                {
                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_SideStepRight = 1;
                         playerStatusPtr->Mvt_SideStepIncrement = ONE_FIXED;
@@ -1133 +1138 @@
                 if (KeyboardInput[primaryInput->Walk] || KeyboardInput[secondaryInput->Walk])
                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_Faster = 0;
-                
+
                 if (KeyboardInput[primaryInput->Strafe] || KeyboardInput[secondaryInput->Strafe])
                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_Strafe = 1;
@@ -1139 +1144 @@
                 if (KeyboardInput[primaryInput->Crouch] || KeyboardInput[secondaryInput->Crouch])
                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_Crouch = 1;
-                
+
                 if (KeyboardInput[primaryInput->Jump] || KeyboardInput[secondaryInput->Jump])
                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_Jump = 1;
@@ -1152 +1157 @@
                         case I_Marine:
                         {
-                                if(KeyboardInput[primaryInput->ImageIntensifier]
+                                if (KeyboardInput[primaryInput->ImageIntensifier]
                                  ||KeyboardInput[secondaryInput->ImageIntensifier])
                                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_ChangeVision = 1;
 
-                                if(DebouncedKeyboardInput[primaryInput->ThrowFlare]
+                                if (DebouncedKeyboardInput[primaryInput->ThrowFlare]
                                  ||DebouncedKeyboardInput[secondaryInput->ThrowFlare])
                                         ThrowAFlare();
 
                                 #if !(MARINE_DEMO||DEATHMATCH_DEMO)
-                                if(KeyboardInput[primaryInput->Jetpack]
+                                if (KeyboardInput[primaryInput->Jetpack]
                                  ||KeyboardInput[secondaryInput->Jetpack])
                                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_Jetpack = 1;
                                 #endif
 
-                                if(KeyboardInput[primaryInput->MarineTaunt]
+                                if (KeyboardInput[primaryInput->MarineTaunt]
                                  ||KeyboardInput[secondaryInput->MarineTaunt])
                                         StartPlayerTaunt();
                                 
-                                if(DebouncedKeyboardInput[primaryInput->Marine_MessageHistory]
+                                if (DebouncedKeyboardInput[primaryInput->Marine_MessageHistory]
                                  ||DebouncedKeyboardInput[secondaryInput->Marine_MessageHistory])
                                         MessageHistory_DisplayPrevious();
                                         
-                                if(DebouncedKeyboardInput[primaryInput->Marine_Say]
+                                if (DebouncedKeyboardInput[primaryInput->Marine_Say]
                                  ||DebouncedKeyboardInput[secondaryInput->Marine_Say])
                                         BringDownConsoleWithSayTypedIn();
 
-                                if(DebouncedKeyboardInput[primaryInput->Marine_SpeciesSay]
+                                if (DebouncedKeyboardInput[primaryInput->Marine_SpeciesSay]
                                  ||DebouncedKeyboardInput[secondaryInput->Marine_SpeciesSay])
                                         BringDownConsoleWithSaySpeciesTypedIn();
 
-                                if(KeyboardInput[primaryInput->Marine_ShowScores]
+                                if (KeyboardInput[primaryInput->Marine_ShowScores]
                                  ||KeyboardInput[secondaryInput->Marine_ShowScores])
                                         ShowMultiplayerScores();
@@ -1188 +1193 @@
                         }
                         case I_Predator:
-                        {
-                                extern int CameraZoomLevel;
-                                
-                                if(KeyboardInput[primaryInput->Cloak]
+                        {                               
+                                if (KeyboardInput[primaryInput->Cloak]
                                  ||KeyboardInput[secondaryInput->Cloak])
                                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_ChangeVision = 1;
                                 
-                                if(DebouncedKeyboardInput[primaryInput->CycleVisionMode]
+                                if (DebouncedKeyboardInput[primaryInput->CycleVisionMode]
                                  ||DebouncedKeyboardInput[secondaryInput->CycleVisionMode])
                                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_CycleVisionMode = 1;
 
                                 #if !(PREDATOR_DEMO||DEATHMATCH_DEMO)
-                                if(DebouncedKeyboardInput[primaryInput->GrapplingHook]
+                                if (DebouncedKeyboardInput[primaryInput->GrapplingHook]
                                  ||DebouncedKeyboardInput[secondaryInput->GrapplingHook])
                                         playerStatusPtr->Mvt_InputRequests.Flags.Rqst_GrapplingHook = 1;
                                 #endif
 
-                                if(DebouncedKeyboardInput[primaryInput->ZoomIn]
+                                if (DebouncedKeyboardInput[primaryInput->ZoomIn]
                                  ||DebouncedKeyboardInput[secondaryInput->ZoomIn])
                                 {
                                         if (CameraZoomLevel<3) CameraZoomLevel++;
                                 }
-                                if(DebouncedKeyboardInput[primaryInput->ZoomOut]
+                                if (DebouncedKeyboardInput[primaryInput->ZoomOut]
                                  ||DebouncedKeyboardInput[secondaryInput->ZoomOut])
                                 {
@@ -1218 +1221 @@
                                 MaintainZoomingLevel();
                                 
-                                if(KeyboardInput[primaryInput->PredatorTaunt]
+                                if (KeyboardInput[primaryInput->PredatorTaunt]
                                  ||KeyboardInput[secondaryInput->PredatorTaunt])
                                         StartPlayerTaunt();
 
-                                if(KeyboardInput[primaryInput->RecallDisc]
+                                if (KeyboardInput[primaryInput->RecallDisc]
                                  ||KeyboardInput[secondaryInput->RecallDisc])
                                         Recall_Disc();
                                         
-                                if(DebouncedKeyboardInput[primaryInput->Predator_MessageHistory]
+                                if (DebouncedKeyboardInput[primaryInput->Predator_MessageHistory]
                                  ||DebouncedKeyboardInput[secondaryInput->Predator_MessageHistory])
                                         MessageHistory_DisplayPrevious();
                                         
-                                if(DebouncedKeyboardInput[primaryInput->Predator_Say]
+                                if (DebouncedKeyboardInput[primaryInput->Predator_Say]
                                  ||DebouncedKeyboardInput[secondaryInput->Predator_Say])
                                         BringDownConsoleWithSayTypedIn();
 
-                                if(DebouncedKeyboardInput[primaryInput->Predator_SpeciesSay]
+                                if (DebouncedKeyboardInput[primaryInput->Predator_SpeciesSay]
                                  ||DebouncedKeyboardInput[secondaryInput->Predator_SpeciesSay])
                                         BringDownConsoleWithSaySpeciesTypedIn();
 
-                                if(KeyboardInput[primaryInput->Predator_ShowScores]
+                                if (KeyboardInput[primaryInput->Predator_ShowScores]
                                  ||KeyboardInput[secondaryInput->Predator_ShowScores])
                                         ShowMultiplayerScores();
@@ -1254 +1257 @@
                                  ||KeyboardInput[secondaryInput->Taunt])
                                         StartPlayerTaunt();
-        
+
                                 if(DebouncedKeyboardInput[primaryInput->Alien_MessageHistory]
                                  ||DebouncedKeyboardInput[secondaryInput->Alien_MessageHistory])
@@ -1430 +1433 @@
                         if(DebouncedKeyboardInput[FixedInputConfig.Weapon10])
                         {
-                                extern void save_preplaced_decals();
                                 save_preplaced_decals();
                         }
@@ -1454 +1456 @@
         if (GotMouse)
         {
-                extern int MouseVelX;
-                extern int MouseVelY;
-
                 if (ControlMethods.HAxisIsTurning)
                 {
@@ -1541 +1540 @@
         }
 
-        /* handle xbox controllers seperate from joysticks */
+        // handle xbox controllers seperate from joysticks
         if (GotXPad)
         {
-//              char buf[100];
                 #define JOYSTICK_DEAD_ZONE 12000
                 int yAxis = xPadMoveY * 2;
@@ -1616 +1614 @@
         {
                 #define JOYSTICK_DEAD_ZONE 12000
-                extern JOYINFOEX JoystickData;
-                extern JOYCAPS JoystickCaps;
 
                 int yAxis = (32768-JoystickData.dwYpos)*2;
@@ -1894 +1890 @@
         #endif
 
-        if (DebouncedKeyboardInput[KEY_GRAVE]) 
+        if (DebouncedKeyboardInput[KEY_GRAVE]) {
                 IOFOCUS_Toggle();
+        }
 }
 
@@ -1905 +1902 @@
         LoadAKeyConfiguration("avpkey.cfg");
         #endif
-
 }
 

branches/workbranch/trunk/3dc/avp/win95/winmain.cpp

@@ -212 +212 @@
         }
 
-        if (strstr(command_line, "-intro"))     
+        if (strstr(command_line, "-intro"))     {
                 WeWantAnIntro();
+        }
 
         if (strstr(command_line, "-qm"))
@@ -298 +299 @@
 
         #if PLAY_INTRO//(MARINE_DEMO||ALIEN_DEMO||PREDATOR_DEMO)
-        if (!LobbiedGame)  // Edmond
+        if (!LobbiedGame) { // Edmond
                 WeWantAnIntro();
+        }
         #endif
         GetPathFromRegistry();
@@ -324 +326 @@
         #if debug && 1//!PREDATOR_DEMO
 
-        if (instr = strstr(command_line, "-s"))
+        if (instr = strstr(command_line, "-s")) {
                 sscanf(instr, "-s%d", &level_to_load);
+        }
 
         #endif
@@ -467 +470 @@
                                 case I_GM_Playing:
                                 {
-                                        if ((!menusActive || (AvP.Network!=I_No_Network && !netGameData.skirmishMode)) && !AvP.LevelCompleted)
+                                        if ((!menusActive || (AvP.Network != I_No_Network && !netGameData.skirmishMode)) && !AvP.LevelCompleted)
                                         {
                                                 //#if MainTextPrint             /* debugging stuff */
@@ -507 +510 @@
                                                 // check to see if we're pausing the game;
                                                 // if so kill off any sound effects
-                                                if (InGameMenusAreRunning() && ((AvP.Network != I_No_Network && netGameData.skirmishMode) || (AvP.Network == I_No_Network)))
+                                                if (InGameMenusAreRunning() && ((AvP.Network != I_No_Network && netGameData.skirmishMode) || (AvP.Network == I_No_Network))) {
                                                         SoundSys_StopAll();
+                                                }
                                         }
                                         else
@@ -566 +570 @@
                                 RestartLevel();
                         }
-                }// end of main game loop
+                } // end of main game loop
 
                 AvP.LevelCompleted = thisLevelHasBeenCompleted;
@@ -578 +582 @@
                 ReleaseAllFMVTextures();
 
-                /* DHM 8/4/98 */
                 CONSBIND_WriteKeyBindingsToConfigFile();
 
-                /* CDF 2/10/97 */
                 DeInitialisePlayer();
 
@@ -595 +597 @@
 
                 #endif
-                /* Patrick 26/6/97
-                Stop and remove all game sounds here, since we are returning to the menus */
-//              SoundSys_StopAll();
+
                 ResetEaxEnvironment();
-                //make sure the volume gets reset for the menus
+
+                // make sure the volume gets reset for the menus
                 SoundSys_ResetFadeLevel();
 
@@ -617 +618 @@
 
 #if 0 //bjd - FIXME
-                if(LobbiedGame)
+                if (LobbiedGame)
                 {
                         /*

branches/workbranch/trunk/3dc/d3d_render.cpp

@@ -355 +355 @@
 //      mainList->Sort();
 
-        // Melanikus 18/11/11 - Nvidia 3D Vision fix
-        // Setting the projection matrix to 
-        // the rhw shader so we can have a non
+        // Melanikus 18/11/11 - Nvidia 3D Vision fix. Setting the projection matrix to the rhw shader so we can have a non
         // ortho projection
         R_MATRIX projection;
-        D3DXMatrixPerspectiveFovRH(&projection,D3DXToRadian(90.0f),4.0f/3.0f,0.0f,1.0f);
+        D3DXMatrixPerspectiveFovRH(&projection, D3DXToRadian(90.0f), 4.0f/3.0f ,0.0f, 1.0f);
         d3d.rhwDecl->Set();
         d3d.effectSystem->SetActive(d3d.rhwEffect);
@@ -612 +610 @@
 {
         alpha = (alpha / 256);
-        if (alpha > 255)
+        if (alpha > 255) {
                 alpha = 255;
+        }
 
         RCOLOR colour = RCOLOR_ARGB(alpha, 255, 255, 255);
@@ -759 +758 @@
         assert(ftPtr);
 
-        if (!ftPtr)
+        if (!ftPtr) {
                 return;
-
-        if (!NextFMVTextureFrame(ftPtr))
-        {
+        }
+
+        if (!NextFMVTextureFrame(ftPtr)) {
                 return;
         }
@@ -801 +800 @@
 {
         alpha = alpha / 256;
-        if (alpha > 255)
+        if (alpha > 255) {
                 alpha = 255;
+        }
 
         RCOLOR colour = RCOLOR_ARGB(alpha,0,0,0);
@@ -958 +958 @@
                 OutputDebugString("DrawPrimitiveUP failed\n");
         }
-
 }
 
@@ -1019 +1018 @@
 
         alpha = (alpha / 256);
-        if (alpha > 255)
+        if (alpha > 255) {
                 alpha = 255;
+        }
 
         DrawQuad(topX, topY, textureWidth, textureHeight, textureID, RCOLOR_ARGB(alpha, 255, 255, 255), TRANSLUCENCY_GLOWING);
@@ -1030 +1030 @@
         uint32_t textureHeight = 0;
 
-        if (alpha > ONE_FIXED) // ONE_FIXED = 65536
+        if (alpha > ONE_FIXED) { // ONE_FIXED = 65536
                 alpha = ONE_FIXED;
+        }
 
         alpha = (alpha / 256);
-        if (alpha > 255)
+        if (alpha > 255) {
                 alpha = 255;
+        }
 
         // textures original resolution (if it's a non power of 2, these will be the non power of 2 values)
@@ -1236 +1238 @@
 void DrawCoronas()
 {
-        if (coronaArray.size() == 0)
+        if (coronaArray.size() == 0) {
                 return;
+        }
 
         uint32_t numVertsBackup = RenderPolygon.NumberOfVertices;
@@ -1365 +1368 @@
 void DrawParticles()
 {
-        if (!particleBucket.size())
+        if (!particleBucket.size()) {
                 return;
+        }
 
         // loop particles and add them to vertex buffer

branches/workbranch/trunk/3dc/logString.cpp

@@ -104 +104 @@
 }
 
+void LogDebugString(const std::string &debugString, int LINE, const char* FILE)
+{
+        std::string temp = "Debug message: " + debugString + " Line: " + Util::IntToString(LINE) + " File: " + FILE + "\n";
+        WriteToLog("\t" + temp);
+}
+
+void LogDebugString(const std::string &debugString)
+{
+        // TODO - can specify a flag on cmd args to print these or not?
+        std::string temp = debugString + "\n";
+        WriteToLog(temp);
+}
+
 void LogString(const std::string &logString)
 {
@@ -109 +122 @@
         WriteToLog(temp);
 }
-
-void LogDebugValue(int value)
-{
-        std::ostringstream stream;
-        stream << "\n value was: " << value;
-        OutputDebugString(stream.str().c_str());
-}

branches/workbranch/trunk/3dc/logstring.h

@@ -36 +36 @@
 void LogErrorString(const std::string &errorString, int LINE, const char* FILE);
 void LogErrorString(const std::string &errorString);
+void LogDebugString(const std::string &debugString, int LINE, const char* FILE);
+void LogDebugString(const std::string &debugString);
 const std::string& GetLastErrorMessage();
 void LogString(const std::string &logString);
-void LogDebugValue(int value);
 
 #endif // include guard

branches/workbranch/trunk/3dc/utilities.cpp

@@ -66 +66 @@
         }
 
-        if (c == '\\')
+        if (c == '\\') {
                 return '/';
+        }
 
         return c;
@@ -102 +103 @@
 {
         // check if we've got the path previously and use it again
-        if (*saveFolder)
+        if (*saveFolder) {
                 return saveFolder;
+        }
 
 #ifdef _XBOX

branches/workbranch/trunk/3dc/win95/CD_player.cpp

@@ -7 +7 @@
 #define UseLocalAssert TRUE
 #include "ourasert.h"
+#include "ConfigFile.h"
 
 /* KJL 12:40:35 07/05/98 - This is code derived from Patrick's original stuff & moved into it's own file. */
@@ -39 +40 @@
 
 extern int SetStreamingMusicVolume(int volume);
-static void PlatGetCDDAVolumeControl(void);
-
-void CDDA_Start(void)
-{
-        return; // bjd - revert
-
-        /* function should complete successfully even if no disc in drive */
+static void PlatGetCDDAVolumeControl();
+
+bool useCD = true;
+
+void CDDA_Start()
+{
+        return;
+        useCD = Config_GetBool("[Music]", "UseCDaudio", true);
+
+        // function should complete successfully even if no disc in drive
         CDDAVolume = CDDA_VOLUME_DEFAULT;
         CDPlayerVolume = CDDAVolume;
@@ -51 +55 @@
         CDDAIsInitialised = false;
 
-        if (PlatStartCDDA() != SOUND_PLATFORMERROR)
+        if (PlatStartCDDA())
         {
                 CDDAIsInitialised = true;
                 CDDA_SwitchOn();
-                CDDA_ChangeVolume(CDDAVolume); /* init the volume */
+                CDDA_ChangeVolume(CDDAVolume); // init the volume
                 CDDA_CheckNumberOfTracks();
         }
@@ -61 +65 @@
 }
 
-void CDDA_End(void)
+void CDDA_End()
 {
         if (!CDDAIsInitialised) {
@@ -76 +80 @@
 }
 
-void CDDA_Management(void)
+void CDDA_Management()
 {
         if (!CDDASwitchedOn) {
@@ -89 +93 @@
 {
         if (!CDDASwitchedOn)
-                return; /* CDDA is off */
+                return; // CDDA is off
 
         if (CDDAState == CDOp_Playing)
-                return; /* already playing */
-
-        if ((CDDATrack <= 0)||(CDDATrack >= CDTrackMax))
-                return; /* no such track */
-
-        int ok = PlatPlayCDDA((int)CDDATrack);
-        if (ok != SOUND_PLATFORMERROR)
+                return; // already playing
+
+        if ((CDDATrack <= 0) || (CDDATrack >= CDTrackMax))
+                return; // no such track
+
+        if (PlatPlayCDDA(CDDATrack) != SOUND_PLATFORMERROR)
         {
                 CDDAState = CDOp_Playing;
@@ -118 +121 @@
         }
 
-        int ok = PlatPlayCDDA((int)CDDATrack);
-        if (ok != SOUND_PLATFORMERROR)
+        if (PlatPlayCDDA(CDDATrack) != SOUND_PLATFORMERROR)
         {
                 CDDAState=CDOp_Playing;
@@ -127 +129 @@
 }
 
-extern void CheckCDVolume(void)
+extern void CheckCDVolume()
 {
         if (CDDAVolume != CDPlayerVolume) {
@@ -139 +141 @@
         if (SetStreamingMusicVolume(volume) == 0) // ok
         {
-                CDDAVolume=volume;
+                CDDAVolume = volume;
                 CDPlayerVolume = volume;
         }
@@ -162 +164 @@
 }
 
-int CDDA_GetCurrentVolumeSetting(void)
+int CDDA_GetCurrentVolumeSetting()
 {
         return CDDAVolume;
@@ -172 +174 @@
                 return; // CDDA is off
         }
+
         if (CDDAState != CDOp_Playing) {
                 return; // nothing playing
         }
-        int ok = PlatStopCDDA();
+
+        PlatStopCDDA();
         CDDAState = CDOp_Idle;
         LastCommandGiven = CDCOMMANDID_Stop;
@@ -193 +197 @@
                 return; // CDDA is off already
         }
+
         if (CDDA_IsPlaying()) {
                 CDDA_Stop();
@@ -216 +221 @@
 int CDDA_CheckNumberOfTracks()
 {
-        int numTracks = 0;
+        uint32_t numTracks = 0;
 
         if (CDDA_IsOn())
         {
-                PlatGetNumberOfCDTracks(&numTracks);
+                PlatGetNumberOfCDTracks(numTracks);
 
                 // if there is only one track , then it probably can't be used anyway
@@ -229 +234 @@
 
                 // store the maximum allowed track number
-                CDTrackMax=numTracks;
+                CDTrackMax = numTracks;
         }
         return numTracks;
 }
 
-
-
 // win32 specific
 
-int PlatStartCDDA(void)
+bool PlatStartCDDA()
 {
         DWORD dwReturn;
@@ -254 +257 @@
         {
                 cdDeviceID = kNoDevice;
-                return SOUND_PLATFORMERROR;
+                return false;
         }
         cdDeviceID = mciOpenParms.wDeviceID;
@@ -260 +263 @@
         // now try to get the cd volume control, by obtaining the auxiliary device id for the cd-audio player
         PlatGetCDDAVolumeControl();
-        return 0;
-}
-
-static void PlatGetCDDAVolumeControl(void)
+        return true;
+}
+
+static void PlatGetCDDAVolumeControl()
 {
         uint32_t numDev = mixerGetNumDevs();
@@ -312 +315 @@
                                                 PreGameCDVolume = detailValue.dwValue;
                                                 mixerClose(handle);
-
                                                 return; //success
                                         }
@@ -322 +324 @@
 }
 
-void PlatEndCDDA(void)
+void PlatEndCDDA()
 {
         return;
@@ -345 +347 @@
 
         // check the cdDeviceId
-        if (cdDeviceID==kNoDevice)
-                return SOUND_PLATFORMERROR;
+        if (cdDeviceID == kNoDevice) {
+                return SOUND_PLATFORMERROR;
+        }
 
         // set the time format
         mciSetParms.dwTimeFormat = MCI_FORMAT_MSF;
         dwReturn = mciSendCommand(cdDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD_PTR) &mciSetParms);
-        if (dwReturn)
-        {
+        if (dwReturn) {
 //      NewOnScreenMessage("CD ERROR - TIME FORMAT");
                 return SOUND_PLATFORMERROR;
@@ -361 +363 @@
         mciStatusParms.dwTrack = track;
         dwReturn = mciSendCommand(cdDeviceID, MCI_STATUS, MCI_STATUS_ITEM|MCI_TRACK, (DWORD_PTR) &mciStatusParms);
-        if (dwReturn)
-        {
+        if (dwReturn) {
 //      NewOnScreenMessage("CD ERROR - GET LENGTH");
                 return SOUND_PLATFORMERROR;
@@ -370 +371 @@
         mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF;
         dwReturn = mciSendCommand(cdDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD_PTR) &mciSetParms);
-        if (dwReturn)
-        {
+        if (dwReturn) {
 //      NewOnScreenMessage("CD ERROR - TIME FORMAT");
                 return SOUND_PLATFORMERROR;
@@ -381 +381 @@
         mciPlayParms.dwCallback = (DWORD_PTR)hWndMain;
         dwReturn = mciSendCommand(cdDeviceID, MCI_PLAY, MCI_FROM | MCI_TO | MCI_NOTIFY, (DWORD_PTR) &mciPlayParms);
-        if (dwReturn)
-        {
+        if (dwReturn) {
 //      NewOnScreenMessage("CD ERROR - PLAY");
                 return SOUND_PLATFORMERROR;
@@ -389 +388 @@
 }
 
-int PlatGetNumberOfCDTracks(int* numTracks)
-{
-        DWORD dwReturn;
+int PlatGetNumberOfCDTracks(uint32_t &numTracks)
+{
         MCI_STATUS_PARMS mciStatusParms = {0,0,0,0};
 
         // check the cdDeviceId
-        if (cdDeviceID == kNoDevice)
-                return SOUND_PLATFORMERROR;
-
-        if (!numTracks)
-                return SOUND_PLATFORMERROR;
+        if (cdDeviceID == kNoDevice) {
+                return SOUND_PLATFORMERROR;
+        }
+
+        if (!numTracks) {
+                return SOUND_PLATFORMERROR;
+        }
 
         // find the number tracks
         mciStatusParms.dwItem = MCI_STATUS_NUMBER_OF_TRACKS ;
-        dwReturn = mciSendCommand(cdDeviceID, MCI_STATUS, MCI_STATUS_ITEM , (DWORD_PTR)&mciStatusParms);
+        DWORD dwReturn = mciSendCommand(cdDeviceID, MCI_STATUS, MCI_STATUS_ITEM , (DWORD_PTR)&mciStatusParms);
         if (dwReturn)
         {
@@ -410 +410 @@
 
         // number of tracks is in the dwReturn member
-        *numTracks = (int)mciStatusParms.dwReturn;
+        numTracks = (uint32_t)mciStatusParms.dwReturn;
 
         return 0;
 }
 
-int PlatStopCDDA(void)
+int PlatStopCDDA()
 {
         // check the cdDeviceId
-        if (cdDeviceID == kNoDevice)
-        {
+        if (cdDeviceID == kNoDevice) {
                 return SOUND_PLATFORMERROR;
         }
@@ -425 +424 @@
         // stop the cd player
         DWORD dwReturn = mciSendCommand(cdDeviceID, MCI_STOP, MCI_WAIT, 0);
-        if (dwReturn)
-        {
+        if (dwReturn) {
                 return SOUND_PLATFORMERROR;
         }
@@ -441 +439 @@
 
         // check the cdDeviceId
-        if (cdDeviceID == kNoDevice)
-                return SOUND_PLATFORMERROR;
+        if (cdDeviceID == kNoDevice) {
+                return SOUND_PLATFORMERROR;
+        }
 
         // go through the mixer devices searching for one that can deal with the cd volume
@@ -469 +468 @@
                                 control.cbStruct = sizeof(MIXERCONTROL);
 
-                                //try to get the volume control
+                                // try to get the volume control
                                 if (mixerGetLineControls((HMIXEROBJ)handle, &lineControls, MIXER_GETLINECONTROLSF_ONEBYTYPE) == MMSYSERR_NOERROR)
                                 {
-
                                         MIXERCONTROLDETAILS details;
                                         MIXERCONTROLDETAILS_UNSIGNED detailValue;
@@ -532 +530 @@
                 CDDAState = CDOp_Idle;
                 //NewOnScreenMessage("CD COMMAND RETURNED WITH SUCCESSFUL");
-                /* Play it again, sam */
+                // Play it again, sam
                 if (LastCommandGiven == CDCOMMANDID_PlayLoop)
                 {
@@ -540 +538 @@
         else if (flags & MCI_NOTIFY_FAILURE)
         {
-                /* error while playing: abnormal termination */
+                // error while playing: abnormal termination
                 //NewOnScreenMessage("CD COMMAND FAILED");
                 CDDAState = CDOp_Idle;
@@ -550 +548 @@
         else if (flags & MCI_NOTIFY_ABORTED)
         {
-                /* aborted or superceeded: try and stop the device */
+                // aborted or superceeded: try and stop the device
                 //NewOnScreenMessage("CD COMMAND ABORTED(?)");
           //    CDDA_Stop();

branches/workbranch/trunk/3dc/win95/CD_player.h

@@ -31 +31 @@
   FALSE CDDA operations have any effect until the system has been initialised.
   -----------------------------------------------------------------------------*/
-extern void CDDA_Start(void);
-extern void CDDA_End(void);
+extern void CDDA_Start();
+extern void CDDA_End();
 /* Patrick 10/6/97 --------------------------------------------------------------
  This is provided to allow platform specific polling/management of the CD device
  whilst playing. It should be called during the main game loop.
   -----------------------------------------------------------------------------*/
-extern void CDDA_Management(void);
+extern void CDDA_Management();
 /* Patrick 10/6/97 --------------------------------------------------------------
   Play , change volume, and stop are the basic CDDA operations provided. An
@@ -45 +45 @@
 extern void CDDA_PlayLoop(int CDDATrack);
 extern void CDDA_ChangeVolume(int volume);
-extern void CDDA_Stop(void);
-extern int CDDA_CheckNumberOfTracks(void);
+extern void CDDA_Stop();
+extern int CDDA_CheckNumberOfTracks();
 /* Patrick 23/6/97 --------------------------------------------------------------
   Returns the current CDDA volume setting.  NB if the cd player has not been
@@ -52 +52 @@
   though it may not be changed using CDDA_ChangeVolume().
   -----------------------------------------------------------------------------*/
-extern int CDDA_GetCurrentVolumeSetting(void);
+extern int CDDA_GetCurrentVolumeSetting();
 /* Patrick 10/6/97 --------------------------------------------------------------
   Switch on and switch off may be used to stop and start the CDDA system after
@@ -58 +58 @@
   during a game.
   -----------------------------------------------------------------------------*/
-extern void CDDA_SwitchOn(void);
-extern void CDDA_SwitchOff(void);
+extern void CDDA_SwitchOn();
+extern void CDDA_SwitchOff();
 /* Patrick 10/6/97 --------------------------------------------------------------
   These are provided to interrogate the state of the CDDA system.
@@ -86 +86 @@
   or zero otherwise.
   ----------------------------------------------------------------------------*/
-extern int PlatStartCDDA(void);
-extern void PlatEndCDDA(void);
+extern bool PlatStartCDDA();
+extern void PlatEndCDDA();
 /* Patrick 10/6/97 -------------------------------------------------------------
   Platform specific play, stop, and change volume functions. NB the volume
@@ -94 +94 @@
   ----------------------------------------------------------------------------*/
 extern int PlatPlayCDDA(int track);
-extern int PlatStopCDDA(void);
+extern int PlatStopCDDA();
 extern int PlatChangeCDDAVolume(int volume);
-int PlatGetNumberOfCDTracks(int* numTracks);
+int PlatGetNumberOfCDTracks(uint32_t &numTracks);
 /* Patrick 10/6/97 -------------------------------------------------------------
   Management functions are provided for platform specific detection of changes
@@ -105 +105 @@
 extern void PlatCDDAManagementCallBack(WPARAM flags, LONG deviceId);
 extern int CDPlayerVolume;
-extern void CheckCDVolume(void);
+extern void CheckCDVolume();
 
 #endif

branches/workbranch/trunk/3dc/win95/VideoModes.cpp

@@ -20 +20 @@
 char *GetVideoModeDescription3() 
 {
+/*
         const uint32_t kBufferSize = 32;
 
@@ -37 +38 @@
 
         return buf;
+*/
+        return (char*)R_GetVideoModeDescription().c_str();
 }
 

branches/workbranch/trunk/3dc/win95/chnkload.cpp

@@ -32 +32 @@
 double local_scale;
 
-File_Chunk * Env_Chunk = 0;
+File_Chunk *Env_Chunk = 0;
 
 RIFFHANDLE current_rif_handle;
 
-unsigned char const * PaletteMapTable;
+unsigned char const *PaletteMapTable;
 
 //////////////////////////////////////////////////////////
-extern LOADED_SOUND const * GetSoundForMainRif(const char* wav_name);
-extern char * extsounddir ;
-extern char * sounddir ;
+extern LOADED_SOUND const *GetSoundForMainRif(const char *wav_name);
+extern char *extsounddir;
+extern char *sounddir;
 
 struct Shape_Fragment_Type

branches/workbranch/trunk/3dc/win95/huffman.cpp

@@ -16 +16 @@
 {
     union
-    {                                   // the FIRST four bytes
+    {                               // the FIRST four bytes
         struct HuffNode *zero;      // points to the "zero" branch or...
         unsigned int       value;   // holds the value of an end node
@@ -37 +37 @@
 typedef struct
 {
-    long wid;
-    long bits;
+        long wid;
+        long bits;
 
 } HuffEncode;
@@ -82 +82 @@
         strncpy(outpackage->Identifier,COMPRESSED_RIF_IDENTIFIER,8);
         outpackage->CompressedDataSize = HuffEncodeBytes((int*)(outpackage+1), sourcePtr, length, EncodingTable);
-    outpackage->UncompressedDataSize = length;
-    for (int n = 0; n < MAX_DEPTH; n++)  
-        {
-        outpackage->CodelengthCount[n] = Depths[n + 1];
-        }
-    for (int n = 0; n < 256; n++)
-        {
-                outpackage->ByteAssignment[n]  = SymbolCensus[n + 1].Symbol;
+        outpackage->UncompressedDataSize = length;
+
+        for (int n = 0; n < MAX_DEPTH; n++)
+        {
+                outpackage->CodelengthCount[n] = Depths[n + 1];
+        }
+        for (int n = 0; n < 256; n++)
+        {
+                outpackage->ByteAssignment[n] = SymbolCensus[n + 1].Symbol;
         }
         return outpackage;
 }
-                        
+
 static void PerformSymbolCensus(unsigned char *sourcePtr, int length)
 {
@@ -109 +110 @@
         }
         while (--length);
-}                       
+}
 
 static int __cdecl HuffItemsSortSub(const void *cmp1, const void *cmp2)
 {
-    if (((HuffItem *)cmp1)->Count > ((HuffItem *)cmp2)->Count)
+        if (((HuffItem *)cmp1)->Count > ((HuffItem *)cmp2)->Count) {
         return  1;
-    if (((HuffItem *)cmp1)->Count < ((HuffItem *)cmp2)->Count)
+        }
+    if (((HuffItem *)cmp1)->Count < ((HuffItem *)cmp2)->Count) {
         return -1;
+        }
     return 0;
 }
@@ -135 +138 @@
     unsigned int sum;
 
-    if (!count) return;
+    if (!count) {
+                return;
+        }
 
     movdest = base + 1;
@@ -142 +147 @@
     for (n = 0; n < count; n++)
     {
-        temp[n].bits = source[n].Count;
+                temp[n].bits = source[n].Count;
         }
     while ((upperlim = --count))
     {
-        if (temp[0].zero)
+        if (temp[0].zero) {
             temp[0].zero->parent = temp[0].one->parent = movdest;
-        if (temp[1].zero)
+                }
+        if (temp[1].zero) {
             temp[1].zero->parent = temp[1].one->parent = movdest + 1;
+                }
         movdest[0]   = *temp++;
         movdest[1]   = *temp;
@@ -175 +182 @@
     }
     base[0] = temp[0];
-    if (base[0].zero)
+
+    if (base[0].zero) {
         base[0].zero->parent = base[0].one->parent = base;
+        }
 }
 
@@ -184 +193 @@
     HuffNode *back;
 
-    for (n = 0; n < maxdepth + 1; n++)
+    for (n = 0; n < maxdepth + 1; n++) {
         dest[n] = 0;
+        }
+
     depth = 0;
+
     while (1)
     {
@@ -195 +207 @@
         }
         
-        if (depth > maxdepth) dest[maxdepth]++;
-        else dest[depth]++;
+        if (depth > maxdepth) {
+                        dest[maxdepth]++;
+                }
+        else { 
+                        dest[depth]++;
+                }
 
         do
@@ -202 +218 @@
             back   = source;
             source = source->parent;
-            if (!depth--)
+            if (!depth--) {
                 return;
+                        }
         }
         while (back == source->zero);
 
         source = source->zero;
-            depth++;
+                depth++;
     }
 }
@@ -218 +235 @@
 
     goal = 1 << maxdepth;
+
     for (n = 0, sum = 0, items = 0; n <= (unsigned int)maxdepth; n++)
     {
@@ -223 +241 @@
         sum   += (goal >> n) * depth[n];
     }
-    if (items > goal)
+
+    if (items > goal) {
         return -1;                              // failure
+        }
+
     for (n = maxdepth - 1; sum > goal; n--)
     {
@@ -244 +265 @@
         {
             gain = hi - (1 << (maxdepth - m));
-            if (excess < gain)
+
+            if (excess < gain) {
                 break;
+                        }
+
             if (depth[m])
             {
@@ -256 +280 @@
         }
     }
-    return 0;                           // success
+    return 0;    // success
 }
 
@@ -285 +309 @@
             {
                 cur  ^= bt;                     // do an add modulo 1
-                if ((cur & bt) || !bt)          // break if now a 1
+                if ((cur & bt) || !bt) {         // break if now a 1
                     break;                      // or out of bits
+                                }
                 bt  >>=  1;                     // do next bit position
             }
@@ -301 +326 @@
     unsigned char *sourcelim, *sourceend;
 
-    if (!count) return 0;
+    if (!count) {
+                return 0;
+        }
 
         accum = 0;
@@ -330 +357 @@
            
             wid       += available;
-            if (wid) accum = (accum >> wid) | (bits << (32 - wid));
+            if (wid) {
+                                accum = (accum >> wid) | (bits << (32 - wid));
+                        }
             *dest++    = accum;
             wid       -= available;
@@ -357 +386 @@
         {
             wid       += available;
-            if (wid)
+            if (wid) {
                 accum  = (accum >> wid) | (bits << (32 - wid));
+                        }
             *dest++    = accum;
             wid       -= available;
@@ -368 +398 @@
             accum = (accum >> wid) | (bits << (32 - wid));
                 }
-    }    
+    }
     *dest++ = accum >> available;
     return (int)((dest - start) * 4);

branches/workbranch/trunk/tools/installer/avpx.iss

@@ -3 +3 @@
 
 #define MyAppName "AvPx"
-#define MyAppVersion "1.0"
+#define MyAppVersion "0.1"
 #define MyAppPublisher "SirLemonhead"
 #define MyAppURL "http://homepage.eircom.net/~duncandsl/avp/"
@@ -20 +20 @@
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\Fox\Aliens versus Predator
+DefaultDirName={pf}
 DefaultGroupName={#MyAppName}
 OutputBaseFilename=setup
 Compression=lzma
 SolidCompression=yes
+UsePreviousAppDir=no
 
 [Languages]

branches/workbranch/trunk/win32/Di_func.cpp

@@ -59 +59 @@
 //extern HWND hWndMain;
 
-int GotMouse;
+bool GotMouse;
 int MouseVelX;
 int MouseVelY;
@@ -870 +870 @@
         if (Osk_IsActive())
         {
-                if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_15])
+                if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_15]) {
                         Osk_MoveLeft();
-
-                else if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_16])
+                }
+                else if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_16]) {
                         Osk_MoveRight();
-
-                else if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_13])
+                }
+                else if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_13]) {
                         Osk_MoveUp();
-
-                else if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_14])
+                }
+                else if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_14]) {
                         Osk_MoveDown();
-
+                }
                 else if (DebouncedKeyboardInput[KEY_JOYSTICK_BUTTON_2])
                 {
@@ -1016 +1016 @@
         int OldMouseX, OldMouseY;
 
-        GotMouse = FALSE;
-
-        if (mouseMoved == false) 
+        GotMouse = false;
+
+        if (mouseMoved == false) {
                 return;
+        }
 
         MouseVelX = 0;
@@ -1031 +1032 @@
         OldMouseY = MouseY;
 
-        GotMouse = TRUE;
+        GotMouse = true;
 
         MouseX += xPosRelative * 4;
@@ -1051 +1052 @@
         int OldMouseX, OldMouseY, OldMouseZ;
 
-        GotMouse = FALSE;
+        GotMouse = false;
         MouseVelX = 0;
         MouseVelY = 0;
@@ -1070 +1071 @@
 
     // Check for any data being picked up
-        GotMouse = TRUE;
+        GotMouse = true;
         if (dwElements == 0) return;
 
@@ -1152 +1153 @@
     #if 0
         textprint("MouseNormalFrameTime %d\n",MouseNormalFrameTime);
-        textprint("Got Mouse %d\n", GotMouse);
+//      textprint("Got Mouse %d\n", GotMouse);
         textprint("Vel X %d\n", MouseVelX);
         textprint("Vel Y %d\n", MouseVelY);

branches/workbranch/trunk/win32/VS2010/AvP.vcxproj

@@ -375 +375 @@
     <ClCompile Include="..\..\3dc\MSLHAND.cpp" />
     <ClCompile Include="..\..\3dc\MurmurHash3.cpp" />
+    <ClCompile Include="..\..\3dc\MusicPlayer.cpp" />
     <ClCompile Include="..\..\3dc\networking.cpp" />
     <ClCompile Include="..\..\3dc\OBJECT.cpp" />
@@ -615 +616 @@
     <ClInclude Include="..\..\3dc\MSLHAND.H" />
     <ClInclude Include="..\..\3dc\MurmurHash3.h" />
+    <ClInclude Include="..\..\3dc\MusicPlayer.h" />
     <ClInclude Include="..\..\3dc\networking.h" />
     <ClInclude Include="..\..\3dc\OnScreenKeyboard.h" />

branches/workbranch/trunk/win32/d3_func.cpp

@@ -280 +280 @@
                         if (D3DERR_DEVICENOTRESET == LastError)
                         {
-                                OutputDebugString("Releasing resources for a device reset..\n");
+                                LogDebugString("Releasing resources for a device reset...");
 
                                 if (FAILED(d3d.lpD3DDevice->Reset(&d3d.d3dpp)))
                                 {
-                                        OutputDebugString("Couldn't reset device\n");
+                                        LogDebugString("Couldn't reset device");
                                 }
                                 else
                                 {
-                                        OutputDebugString("We have reset the device. recreating resources..\n");
+                                        LogDebugString("We have reset the device. recreating resources...");
                                         CreateVolatileResources();
 
@@ -300 +300 @@
                         else if (D3DERR_DEVICELOST == LastError)
                         {
-                                OutputDebugString("D3D device lost\n");
+                                LogDebugString("D3D device lost");
                         }
                         else if (D3DERR_DRIVERINTERNALERROR == LastError)
@@ -887 +887 @@
         {
                 LogDxError(LastError, __LINE__, __FILE__);
-                OutputDebugString("Couldn't create screenshot surface\n");
+                LogErrorString("Couldn't create screenshot surface");
                 return;
         }
@@ -895 +895 @@
         {
                 LogDxError(LastError, __LINE__, __FILE__);
-                OutputDebugString("Couldn't get a copy of the front buffer\n");
+                LogErrorString("Couldn't get a copy of the front buffer");
                 SAFE_RELEASE(frontBuffer);
                 return;
@@ -904 +904 @@
         {
                 LogDxError(LastError, __LINE__, __FILE__);
-                OutputDebugString("Save Surface to file failed\n");
+                LogErrorString("Save Surface to file failed");
         }
 
@@ -1239 +1239 @@
         if (FAILED(LastError))
         {
-                OutputDebugString(DXGetErrorString(LastError));
-                OutputDebugString(DXGetErrorDescription(LastError));
-
                 LogErrorString("D3DXCompileShaderFromFile failed for '" + actualPath + "'", __LINE__, __FILE__);
+                LogErrorString("DX Error- " + std::string(DXGetErrorString(LastError)) + " " + std::string(DXGetErrorDescription(LastError)));
 
                 if (pErrors)
@@ -1248 +1246 @@
                         // shader didn't compile for some reason
                         LogErrorString("Shader compile errors found for '" + actualPath + "'", __LINE__, __FILE__);
-                        LogErrorString("\n" + std::string((const char*)pErrors->GetBufferPointer()));
+                        LogErrorString(std::string((const char*)pErrors->GetBufferPointer()));
 
                         pErrors->Release();
@@ -1280 +1278 @@
         std::stringstream message;
         message << "Processing constants for vertex shader '" << fileName << "' which has " << constantTableDesc.Constants << " constant(s)\n";
-        OutputDebugString(message.str().c_str());
+        LogDebugString(message.str());
 
         D3DXCONSTANT_DESC constantDesc;
@@ -1297 +1295 @@
                 std::stringstream constantInfo;
                 constantInfo << "\t Name: " << constantDesc.Name << ", Register Index: " << constantDesc.RegisterIndex << /*", Register Index: " << constantDesc.RegisterIndex <<*/ "\n";
-                OutputDebugString(constantInfo.str().c_str());
+                LogDebugString(constantInfo.str());
         }
 
@@ -1332 +1330 @@
         if (FAILED(LastError))
         {
-                OutputDebugString(DXGetErrorString(LastError));
-                OutputDebugString(DXGetErrorDescription(LastError));
-
                 LogErrorString("D3DXCompileShaderFromFile failed for '" + actualPath + "'", __LINE__, __FILE__);
+                LogErrorString("DX Error- " + std::string(DXGetErrorString(LastError)) + " " + std::string(DXGetErrorDescription(LastError)));
 
                 if (pErrors)
                 {
                         // shader didn't compile for some reason
-                        OutputDebugString((const char*)pErrors->GetBufferPointer());
-
                         LogErrorString("Shader compile errors found for '" + actualPath + "'", __LINE__, __FILE__);
-                        LogErrorString("\n" + std::string((const char*)pErrors->GetBufferPointer()));
+                        LogErrorString(std::string((const char*)pErrors->GetBufferPointer()));
 
                         pErrors->Release();
@@ -1375 +1369 @@
         std::stringstream message;
         message << "Processing constants for pixel shader '" << fileName << "' which has " << constantTableDesc.Constants << " constant(s)\n";
-        OutputDebugString(message.str().c_str());
+        LogDebugString(message.str());
 
         D3DXCONSTANT_DESC constantDesc;
@@ -1392 +1386 @@
                 std::stringstream constantInfo;
                 constantInfo << "\t Name: " << constantDesc.Name << ", Register Index: " << constantDesc.RegisterIndex << /*", Register Index: " << constantDesc.RegisterIndex <<*/ "\n";
-                OutputDebugString(constantInfo.str().c_str());
+                LogDebugString(constantInfo.str());
         }
 
@@ -1884 +1878 @@
                 Con_PrintError(sstream.str());
 
-                OutputDebugString(DXGetErrorString(LastError));
-                OutputDebugString(DXGetErrorDescription(LastError));
-                OutputDebugString("\n");
-
                 // this'll occur if the resolution width and height passed aren't usable on this device
                 if (D3DERR_INVALIDCALL == LastError)
@@ -1973 +1963 @@
         D3DFORMAT SelectedBackbufferFormat = D3DFMT_X8R8G8B8; // back buffer format
 
-        if (WindowMode == WindowModeSubWindow)
+        if (WindowMode == WindowModeSubWindow) {
                 windowed = true;
+        }
 
         // Zero d3d structure
@@ -2081 +2072 @@
                                         for (; f < numFomats; f++ )
                                         {
-                                                if (DisplayMode.Format == d3d.Driver[thisDevice].Formats[f])
+                                                if (DisplayMode.Format == d3d.Driver[thisDevice].Formats[f]) {
                                                         break;
+                                                }
                                         }
 
                                         // If the format is new, add it to the list
-                                        if (f == numFomats)
+                                        if (f == numFomats) {
                                                 d3d.Driver[thisDevice].Formats[numFomats++] = DisplayMode.Format;
+                                        }
                                 }
                         }
@@ -2801 +2794 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DRS_ZWRITEENABLE D3DZB_TRUE failed\n");
+                        LogDebugString("D3DRS_ZWRITEENABLE D3DZB_TRUE failed\n");
                 }
         }
@@ -2809 +2802 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DRS_ZWRITEENABLE D3DZB_FALSE failed\n");
-                        OutputDebugString("DISABLING Z WRITES\n");
+                        LogDebugString("D3DRS_ZWRITEENABLE D3DZB_FALSE failed\n");
+                        LogDebugString("DISABLING Z WRITES\n");
                 }
         }
@@ -2835 +2828 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DSAMP_ADDRESSU Wrap fail\n");
+                        LogDebugString("D3DSAMP_ADDRESSU Wrap fail\n");
                 }
 
@@ -2841 +2834 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DSAMP_ADDRESSV Wrap fail\n");
+                        LogDebugString("D3DSAMP_ADDRESSV Wrap fail\n");
                 }
 
@@ -2847 +2840 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DSAMP_ADDRESSW Wrap fail\n");
+                        LogDebugString("D3DSAMP_ADDRESSW Wrap fail\n");
                 }
         }
@@ -2856 +2849 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DSAMP_ADDRESSU Clamp fail\n");
+                        LogDebugString("D3DSAMP_ADDRESSU Clamp fail\n");
                 }
 
@@ -2862 +2855 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DSAMP_ADDRESSV Clamp fail\n");
+                        LogDebugString("D3DSAMP_ADDRESSV Clamp fail\n");
                 }
 
@@ -2868 +2861 @@
                 if (FAILED(LastError))
                 {
-                        OutputDebugString("D3DSAMP_ADDRESSW Clamp fail\n");
+                        LogDebugString("D3DSAMP_ADDRESSW Clamp fail\n");
                 }
         }
@@ -2897 +2890 @@
                 default:
                 {
-                        LOCALASSERT("Unrecognized filtering mode"==0);
-                        OutputDebugString("Unrecognized filtering mode\n");
+                        LogDebugString("Unrecognized filtering mode\n");
                         break;
                 }