wzredemption-svn Mailing List for Warzone 2100 Redemption
Status: Beta
Brought to you by:
pheonixstorm
Menu
▾
▴
wzredemption-svn — Commit logs
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(14) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <phe...@us...> - 2013-06-18 09:01:28
|
Revision: 50
http://sourceforge.net/p/wzredemption/code/50
Author: pheonixstorm
Date: 2013-06-18 09:01:25 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Fixed a few compiler warnings
Modified Paths:
--------------
trunk/lib/framework/block.c
trunk/lib/framework/mem.c
trunk/lib/framework/wdg.c
Modified: trunk/lib/framework/block.c
===================================================================
--- trunk/lib/framework/block.c 2013-06-18 06:24:27 UTC (rev 49)
+++ trunk/lib/framework/block.c 2013-06-18 09:01:25 UTC (rev 50)
@@ -364,7 +364,6 @@
psCurr->pLastAllocated=pAlloc;
///* - error trapping an out-of-mem allocation !!!
-NoMemChk:
return pAlloc;
}
//*/
@@ -440,8 +439,8 @@
#endif
{
- BOOL bRes;
+
#if(1)
//DBPRINTF(("UNABLE TO FREE MEMORY\n"));
Modified: trunk/lib/framework/mem.c
===================================================================
--- trunk/lib/framework/mem.c 2013-06-18 06:24:27 UTC (rev 49)
+++ trunk/lib/framework/mem.c 2013-06-18 09:01:25 UTC (rev 50)
@@ -399,6 +399,7 @@
psRoot->size;
}
#endif
+ return 0; // Just to shut up the stupid compiler
}
#if DEBUG_MALLOC
Modified: trunk/lib/framework/wdg.c
===================================================================
--- trunk/lib/framework/wdg.c 2013-06-18 06:24:27 UTC (rev 49)
+++ trunk/lib/framework/wdg.c 2013-06-18 09:01:25 UTC (rev 50)
@@ -609,8 +609,8 @@
}
else if (CacheSize==0)
{
- UBYTE *CacheStart = NULL;
- UDWORD CacheSize; //= NULL;
+ UBYTE *CacheStart = NULL;
+ UDWORD CacheSize = 0;
Cache.IsCacheDataMalloced=FALSE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2013-06-18 06:24:29
|
Revision: 49
http://sourceforge.net/p/wzredemption/code/49
Author: pheonixstorm
Date: 2013-06-18 06:24:27 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Some annoying warnings fixed
Added notes for future changes
Enabled video menu for renderer selection. Still need to add resolution options.
Still compiles and runs. Still need to makes changes to strings.txt
Modified Paths:
--------------
trunk/src/Deliv.rc
trunk/src/clparse.c
trunk/src/cluster.c
trunk/src/cmddroid.c
trunk/src/config.c
trunk/src/data.c
trunk/src/deliverance.h
trunk/src/frontend.c
trunk/src/frontend.h
trunk/src/init.c
trunk/src/keyedit.c
trunk/src/objmem.c
trunk/src/text.h
trunk/src/warzoneconfig.h
trunk/src/winmain.c
trunk/src/winmain.h
trunk/src/wrappers.c
Modified: trunk/src/Deliv.rc
===================================================================
--- trunk/src/Deliv.rc 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/Deliv.rc 2013-06-18 06:24:27 UTC (rev 49)
@@ -81,8 +81,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,2,45
- PRODUCTVERSION 1,10,2,45
+ FILEVERSION 1,10,2,48
+ PRODUCTVERSION 1,10,2,48
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -99,12 +99,12 @@
BEGIN
VALUE "CompanyName", "DarkStorm Interactive"
VALUE "FileDescription", "Warzone 2100"
- VALUE "FileVersion", "1.10.2.45"
+ VALUE "FileVersion", "1.10.2.48"
VALUE "InternalName", "Warzone 2100"
VALUE "LegalCopyright", "Copyright Pumpkin Studios, EIDOS Interactive 1998"
VALUE "OriginalFilename", "Warzone.exe"
VALUE "ProductName", "Warzone 2100"
- VALUE "ProductVersion", "1.10.2.45"
+ VALUE "ProductVersion", "1.10.2.48"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/clparse.c
===================================================================
--- trunk/src/clparse.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/clparse.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -45,7 +45,6 @@
char seps[] = " ,\t\n";
char *tokenType;
char *token;
- BOOL bCrippleD3D = FALSE; // Disable higher resolutions for d3D
char seps2[] ="\"";
char cl[255];
char cl2[255];
@@ -63,7 +62,7 @@
{
if ( stricmp( tokenType, "-window" ) == 0 )
{
-#ifdef _DEBUG
+#ifdef _DEBUG // FIXME Makes no sense to have windowed in an ifdef if the result is the same either way. Remove.
clStartWindowed = TRUE;
#else
clStartWindowed = TRUE;
@@ -81,7 +80,7 @@
pie_SetVideoBufferHeight(480);
}
- else if ( stricmp( tokenType, "-3DFX" ) == 0 )
+ else if ( stricmp( tokenType, "-3DFX" ) == 0 ) // FIXME Replace for OpenGL
{
if (!bGlideDllPresent)
{
@@ -99,26 +98,25 @@
war_SetRendMode(REND_MODE_HAL);
pie_SetDirect3DDeviceName("Direct3D HAL");
-// bCrippleD3D = TRUE;
pie_SetVideoBufferWidth(640);
pie_SetVideoBufferHeight(480);
}
- else if ( stricmp( tokenType, "-MMX" ) == 0 )
+ else if ( stricmp( tokenType, "-MMX" ) == 0 ) // REMOVE
{
war_SetRendMode(REND_MODE_RGB);
pie_SetDirect3DDeviceName("RGB Emulation");
pie_SetVideoBufferWidth(640);
pie_SetVideoBufferHeight(480);
}
- else if ( stricmp( tokenType, "-RGB" ) == 0 )
+ else if ( stricmp( tokenType, "-RGB" ) == 0 ) // REMOVE
{
war_SetRendMode(REND_MODE_RGB);
pie_SetDirect3DDeviceName("RGB Emulation");
pie_SetVideoBufferWidth(640);
pie_SetVideoBufferHeight(480);
}
- else if ( stricmp( tokenType, "-REF" ) == 0 )
+ else if ( stricmp( tokenType, "-REF" ) == 0 ) // REMOVE I don't think REF is used past DX8
{
war_SetRendMode(REND_MODE_REF);
pie_SetDirect3DDeviceName("Reference Rasterizer");
Modified: trunk/src/cluster.c
===================================================================
--- trunk/src/cluster.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/cluster.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -145,7 +145,7 @@
if (aClusterEmpty[i])
{
scrCBEmptyClusterID = i;
- eventFireCallbackTrigger(CALL_CLUSTER_EMPTY);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_CLUSTER_EMPTY);
aClusterEmpty[i] = FALSE;
}
}
@@ -716,18 +716,18 @@
psScrCBObjSeen = psObj;
psScrCBObjViewer = psViewer;
- eventFireCallbackTrigger(CALL_OBJ_SEEN);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_OBJ_SEEN);
switch (psObj->type)
{
case OBJ_DROID:
- eventFireCallbackTrigger(CALL_DROID_SEEN);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_DROID_SEEN);
break;
case OBJ_STRUCTURE:
- eventFireCallbackTrigger(CALL_STRUCT_SEEN);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_STRUCT_SEEN);
break;
case OBJ_FEATURE:
- eventFireCallbackTrigger(CALL_FEATURE_SEEN);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_FEATURE_SEEN);
break;
default:
ASSERT((FALSE, "clustObjectSeen: invalid object type"));
@@ -749,18 +749,18 @@
// DBPRINTF(("CALL_ATTACKED player %d, cluster %d\n",
// psObj->player, psObj->cluster));
psScrCBTarget = psObj;
- eventFireCallbackTrigger(CALL_ATTACKED);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_ATTACKED);
switch (psObj->type)
{
case OBJ_DROID:
psLastDroidHit = (DROID *)psObj;
- eventFireCallbackTrigger(CALL_DROID_ATTACKED);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_DROID_ATTACKED);
psLastDroidHit = NULL;
break;
case OBJ_STRUCTURE:
psLastStructHit = (STRUCTURE *)psObj;
- eventFireCallbackTrigger(CALL_STRUCT_ATTACKED);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_STRUCT_ATTACKED);
psLastStructHit = NULL;
break;
default:
Modified: trunk/src/cmddroid.c
===================================================================
--- trunk/src/cmddroid.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/cmddroid.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -37,7 +37,7 @@
}
// Make new command droids available
-void cmdDroidAvailable(BRAIN_STATS *psBrainStats, SDWORD player)
+void cmdDroidAvailable(BRAIN_STATS *psBrainStats, SDWORD player) // FIXME Does it even do anything?
{
UNUSEDPARAMETER(psBrainStats);
UNUSEDPARAMETER(player);
Modified: trunk/src/config.c
===================================================================
--- trunk/src/config.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/config.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -1,6 +1,6 @@
/*
*Config.c saves your favourite options to the Registry.
- *
+ * Rewrite to use binary config files or text ini instead of registry.
*/
#include "frame.h"
Modified: trunk/src/data.c
===================================================================
--- trunk/src/data.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/data.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -1710,4 +1710,3 @@
return TRUE;
}
-
Modified: trunk/src/deliverance.h
===================================================================
--- trunk/src/deliverance.h 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/deliverance.h 2013-06-18 06:24:27 UTC (rev 49)
@@ -18,7 +18,7 @@
#define MAX_STR_LENGTH 256
-#define UNUSEDPARAMETER(p) p
+#define UNUSEDPARAMETER(p) p // FIXME WTF is this?
//used to flag for some script code whilst work in progress
#define SCRIPTS
Modified: trunk/src/frontend.c
===================================================================
--- trunk/src/frontend.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/frontend.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -51,7 +51,7 @@
#include "multistat.h"
#include "netplay.h"
-#define VERSION_STRING "VER 1.10.2.45"
+#define VERSION_STRING "VER 1.10.2.49"
extern BOOL bSubtitles;
@@ -118,10 +118,10 @@
BOOL runGameOptionsMenu (VOID);
BOOL startGameOptions2Menu (VOID);
BOOL runGameOptions2Menu (VOID);
-//BOOL startVideoOptionsMenu (VOID);
-//BOOL runVideoOptionsMenu (VOID);
-//BOOL startGraphicsOptionsMenu(VOID);
-//BOOL runGraphicsptionsMenu (VOID);
+BOOL startVideoOptionsMenu (VOID);
+BOOL runVideoOptionsMenu (VOID);
+BOOL startGraphicsOptionsMenu(VOID);
+BOOL runGraphicsptionsMenu (VOID);
VOID addTopForm (VOID);
VOID removeTopForm (VOID);
@@ -142,15 +142,12 @@
static VOID displayBigSlider (struct _widget *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
-// Returns TRUE if escape key pressed on PC or close button pressed on Playstation.
-//
+// Returns TRUE if escape key pressed.
BOOL CancelPressed(VOID)
{
- if(keyPressed(KEY_ESC)) {
- return TRUE;
- }
- return FALSE;
+ return keyPressed(KEY_ESC);
}
+
// ////////////////////////////////////////////////////////////////////////////
// for cursorsnap stuff on pc
VOID processFrontendSnap(BOOL bHideCursor)
@@ -227,10 +224,9 @@
switch(mode)
{
-/* case VIDEO:
+ case VIDEO:
startVideoOptionsMenu();
break;
-*/
case SINGLE:
startSinglePlayerMenu();
break;
@@ -337,7 +333,7 @@
return TRUE;
}
-static void frontEndCDOK( void )
+static void frontEndCDOK( void ) // DELETEME ?? Safe to remove CD functions? Probably.
{
changeTitleMode( g_tModeNext );
}
@@ -384,7 +380,6 @@
changeTitleMode( tModeNext );
}
-
BOOL runTitleMenu(VOID)
{
UDWORD id;
@@ -478,10 +473,10 @@
changeTitleMode(TITLE);
}
- DrawBegin();
- StartCursorSnap(&InterfaceSnap);
+ DrawBegin(); // DELETEME ?? This only used for SR and 4101. Must figure out what those are (both software render?)
+ StartCursorSnap(&InterfaceSnap); // FIXMEWhat is this needed for??
widgDisplayScreen(psWScreen); // show the widgets currently running
- DrawEnd();
+ DrawEnd(); // Same as DrawBegin()
return TRUE;
}
@@ -731,7 +726,8 @@
addSideText (FRONTEND_SIDETEXT , FRONTEND_SIDEX,FRONTEND_SIDEY, strresGetString(psStringRes, STR_FE_SIDEOPTIONS));
addTextButton(FRONTEND_GAMEOPTIONS2,FRONTEND_POS3X,FRONTEND_POS3Y, strresGetString(psStringRes, STR_FE_GRAPHICS),FALSE,FALSE);
addTextButton(FRONTEND_GAMEOPTIONS, FRONTEND_POS4X,FRONTEND_POS4Y, strresGetString(psStringRes, STR_FE_GAME),FALSE,FALSE);
- addTextButton(FRONTEND_KEYMAP, FRONTEND_POS5X,FRONTEND_POS5Y, strresGetString(psStringRes, STR_KM_KEYMAP),FALSE,FALSE);
+ addTextButton(FRONTEND_VIDEO, FRONTEND_POS5X,FRONTEND_POS5Y, strresGetString(psStringRes, STR_FE_VIDEO),FALSE,FALSE);
+ addTextButton(FRONTEND_KEYMAP, FRONTEND_POS6X,FRONTEND_POS6Y, strresGetString(psStringRes, STR_KM_KEYMAP),FALSE,FALSE);
addMultiBut(psWScreen,FRONTEND_BOTFORM,FRONTEND_QUIT,10,10,30,29, STR_FE_RETURN,IMAGE_RETURN,IMAGE_RETURN_HI,TRUE);
SetMousePos(0,320,FRONTEND_BOTFORMY+FRONTEND_POS3Y);
@@ -755,12 +751,12 @@
case FRONTEND_GAMEOPTIONS2:
changeTitleMode(GAME2);
break;
-// case FRONTEND_VIDEO:
-// changeTitleMode(VIDEO);
-// break;
-// case FRONTEND_GRAPHICS:
-// changeTitleMode(GRAPHICS);
-// break;
+ case FRONTEND_VIDEO:
+ changeTitleMode(VIDEO);
+ break;
+ case FRONTEND_GRAPHICS:
+ changeTitleMode(GRAPHICS);
+ break;
case FRONTEND_KEYMAP:
changeTitleMode(KEYMAP);
break;
@@ -786,7 +782,7 @@
// ////////////////////////////////////////////////////////////////////////////
// Graphics Options Menu
-/*
+
BOOL startGraphicsOptionsMenu(VOID) //FIXME may work or may not, but needs to be added :)
{
addBackdrop();
@@ -807,9 +803,13 @@
{
strcpy(strFog, "off");
}
- addTextButton(FRONTEND_FOG, FRONTEND_POS5X,FRONTEND_POS5Y, strresGetString(psStringRes, STR_FE_FOG),TRUE,FALSE);
- addTextButton(FRONTEND_FOG_R, FRONTEND_POS5M,FRONTEND_POS5Y, strFog,TRUE,FALSE);
+ // Original unaltered
+ //addTextButton(FRONTEND_FOG, FRONTEND_POS5X,FRONTEND_POS5Y, strresGetString(psStringRes, STR_FE_FOG),TRUE,FALSE);
+ //addTextButton(FRONTEND_FOG_R, FRONTEND_POS5M,FRONTEND_POS5Y, strFog,TRUE,FALSE);
+ addTextButton(FRONTEND_FOGTYPE, FRONTEND_POS5X,FRONTEND_POS5Y, strresGetString(psStringRes, STR_FE_FOG),TRUE,FALSE);
+ addTextButton(FRONTEND_FOGTYPE_R, FRONTEND_POS5M,FRONTEND_POS5Y, strFog,TRUE,FALSE);
+
//translucency
if (!war_GetTranslucent())
{
@@ -846,17 +846,17 @@
break;
case FRONTEND_EFFECTS:
break;
- case FRONTEND_FOG:
- case FRONTEND_FOG_R:
+ case FRONTEND_FOGTYPE:
+ case FRONTEND_FOGTYPE_R:
if (war_GetFog())
{
war_SetFog(FALSE);
- widgSetString(psWScreen,FRONTEND_FOG_R,"off");
+ widgSetString(psWScreen,FRONTEND_FOGTYPE_R,"off");
}
else
{
war_SetFog(TRUE);
- widgSetString(psWScreen,FRONTEND_FOG_R,"on");
+ widgSetString(psWScreen,FRONTEND_FOGTYPE_R,"on");
}
//changeTitleMode(GRAPHICS);
@@ -915,12 +915,29 @@
addTopForm();
addBottomForm();
-
+ // New Renderer menu: Keep commented out until new strings.txt can be written
+ addTextButton(FRONTEND_RENDER, FRONTEND_POS2X-50, FRONTEND_POS2Y, strresGetString(psStringRes, STR_FE_VIDEO), TRUE, FALSE);
+ switch (war_GetRendMode())
+ {
+ case REND_MODE_HAL:
+ addTextButton(FRONTEND_RENDER_R, FRONTEND_POS2M-25, FRONTEND_POS2Y, strresGetString(psStringRes, STR_FE_DIRECTX),TRUE,FALSE);
+ break;
+ case REND_MODE_OGL:
+ addTextButton(FRONTEND_RENDER_R, FRONTEND_POS2M-25, FRONTEND_POS2Y, strresGetString(psStringRes, STR_FE_OPENGL),TRUE,FALSE);
+ break;
+ case REND_MODE_SOFTWARE:
+ //addTextButton(FRONTEND_RENDER_R, POS2M-25, FRONTEND_POS2Y, strresGetString(psStringRes, STR_),TRUE,FALSE);
+ //break;
+ default:
+ addTextButton(FRONTEND_RENDER_R, FRONTEND_POS2M-25, FRONTEND_POS2Y, strresGetString(psStringRes, STR_FE_SOFTWARE),TRUE,FALSE);
+ break;
+ }
+ /*
addTextButton(FRONTEND_SOFTWARE,FRONTEND_POS2X,FRONTEND_POS2Y, strresGetString(psStringRes, STR_FE_SOFTWARE),FALSE,FALSE);
addTextButton(FRONTEND_DIRECTX, FRONTEND_POS3X,FRONTEND_POS3Y, strresGetString(psStringRes, STR_FE_DIRECTX),FALSE,FALSE);
addTextButton(FRONTEND_OPENGL, FRONTEND_POS4X,FRONTEND_POS4Y, strresGetString(psStringRes, STR_FE_OPENGL),FALSE,TRUE);
addTextButton(FRONTEND_GLIDE, FRONTEND_POS5X,FRONTEND_POS5Y, strresGetString(psStringRes, STR_FE_GLIDE),FALSE,FALSE);
-
+ */
addMultiBut(psWScreen,FRONTEND_BOTFORM,FRONTEND_QUIT,10,10,30,29, STR_FE_RETURN,IMAGE_RETURN,IMAGE_RETURN_HI,TRUE);
SetMousePos(0,320,FRONTEND_BOTFORMY+FRONTEND_POS3Y);
@@ -935,7 +952,7 @@
processFrontendSnap(TRUE);
id = widgRunScreen(psWScreen); // Run the current set of widgets
- switch(id)
+ /* switch(id)
{
case FRONTEND_SOFTWARE:
if (war_GetRendMode() == REND_MODE_SOFTWARE)
@@ -974,13 +991,13 @@
}
break;
case FRONTEND_OPENGL:
- if (war_GetRendMode() == REND_MODE_HAL2)
+ if (war_GetRendMode() == REND_MODE_OGL)
{
changeTitleMode(OPTIONS);
}
else
{
- war_SetRendMode(REND_MODE_HAL2);
+ war_SetRendMode(REND_MODE_OGL);
reInit = TRUE;//restart
changeTitleMode(QUIT);
}
@@ -991,7 +1008,37 @@
default:
break;
}
+ */
+ switch (id)
+ {
+ case FRONTEND_RENDER:
+ case FRONTEND_RENDER_R:
+ switch (war_GetRendMode())
+ {
+ case REND_MODE_HAL:
+ war_SetRendMode(REND_MODE_OGL);
+ widgSetString(psWScreen,FRONTEND_RENDER_R, strresGetString(psStringRes,STR_FE_OPENGL));
+ break;
+ case REND_MODE_OGL:
+ war_SetRendMode(REND_MODE_SOFTWARE);
+ widgSetString(psWScreen,FRONTEND_RENDER_R, strresGetString(psStringRes,STR_FE_SOFTWARE));
+ break;
+ case REND_MODE_SOFTWARE:
+ war_SetRendMode(REND_MODE_HAL);
+ widgSetString(psWScreen,FRONTEND_RENDER_R, strresGetString(psStringRes,STR_FE_DIRECTX));
+ break;
+ }
+ break;
+
+ //case FRONTEND_RESOLUTION:
+ //case FRONTEND_RESOLUTION_R:
+ // switch (pie_GetVideoBufferWidth())
+ // case 800:
+ case FRONTEND_QUIT:
+ changeTitleMode(OPTIONS);
+ break;
+ }
// If close button pressed then return from this menu.
if(CancelPressed()) {
changeTitleMode(OPTIONS);
@@ -1004,8 +1051,8 @@
return TRUE;
}
-*/
+
// ////////////////////////////////////////////////////////////////////////////
// Game Options Menu 2!
BOOL startGameOptions2Menu(VOID)
@@ -1427,9 +1474,9 @@
changeTitleMode(OPTIONS);
break;
-// case FRONTEND_VIDEO:
-// changeTitleMode(VIDEO);
-// break;
+ case FRONTEND_VIDEO:
+ changeTitleMode(VIDEO);
+ break;
case FE_P0:
widgSetButtonState(psWScreen, FE_P0, WBUT_LOCK);
Modified: trunk/src/frontend.h
===================================================================
--- trunk/src/frontend.h 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/frontend.h 2013-06-18 06:24:27 UTC (rev 49)
@@ -24,15 +24,17 @@
LOADSAVEGAME, // 15 loading a save game
KEYMAP, // 16 keymap editor
GAME2, // 17 second options menu.
-// GRAPHICS, // 5
-// VIDEO,
+ GRAPHICS, // 5
+ VIDEO,
} tMode;
//typedef enum _titlemode tMode; // define the type
tMode titleMode; // the global case
-#define DEFAULT_LEVEL "CAM_1A"
+// FIXME Change this to data.
+// Will make creating new campaigns easieras well as additional expansions (NP cam and Collective Cam)
+#define DEFAULT_LEVEL "CAM_1A"
//#define DEFAULT_LEVEL "CAM_2A"
#define TUTORIAL_LEVEL "TUTORIAL3"
@@ -51,8 +53,8 @@
extern BOOL runTitleMenu (VOID);
extern BOOL runSinglePlayerMenu (VOID);
extern BOOL runMultiPlayerMenu (VOID);
-//extern BOOL runVideoOptionsMenu (VOID);
-//extern BOOL runGraphicsOptionsMenu (VOID);
+extern BOOL runVideoOptionsMenu (VOID);
+extern BOOL runGraphicsOptionsMenu (VOID);
extern BOOL runGameOptionsMenu (VOID);
extern BOOL runOptionsMenu (VOID);
extern BOOL runTutorialMenu (VOID);
@@ -186,24 +188,24 @@
#define FRONTEND_CONTROL 20041
#define FRONTEND_CONTROL_BT 20042
-//#define FRONTEND_VIDEO 20051
-//#define FRONTEND_SOFTWARE 20052
-//#define FRONTEND_DIRECTX 20053
-//#define FRONTEND_OPENGL 20054
-//#define FRONTEND_GLIDE 20055
+#define FRONTEND_VIDEO 20051
+#define FRONTEND_SOFTWARE 20052
+#define FRONTEND_DIRECTX 20053
+#define FRONTEND_OPENGL 20054
+#define FRONTEND_GLIDE 20055 // FIXME Replcae with FRONTEND_RENDER_R ?
-// Should this section survive? FIXME
-#define FRONTEND_DEMO 20056
-#define FRONTEND_DEMO1 20057
-#define FRONTEND_DEMO2 20058
-#define FRONTEND_DEMO3 20059
+// Should this section survive? FIXME Recycle and reuse
+#define FRONTEND_RENDER 20056
+#define FRONTEND_RENDER_R 20057
+#define FRONTEND_RESOLUTION 20058
+#define FRONTEND_RESOLUTION_R 20059
#define FRONTEND_DEMO4 20060
#define FRONTEND_DEMO5 20061
#define FRONTEND_LOGO 20062
#define FRONTEND_GAMEOPTIONS 20063
-//#define FRONTEND_GRAPHICS 20064
+#define FRONTEND_GRAPHICS 20064
#define FRONTEND_TEXTURES 20065
#define FRONTEND_TEXTURES_R 20066
#define FRONTEND_EFFECTS 20067
Modified: trunk/src/init.c
===================================================================
--- trunk/src/init.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/init.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -758,7 +758,7 @@
//initialize render engine
switch (war_GetRendMode())
{
- case REND_MODE_GLIDE:
+ case REND_MODE_GLIDE: // FIXME replace with OpenGL
if (!pie_Initialise(REND_GLIDE_3DFX))
{
ASSERT((FALSE,"Unable to initialise 3DFX hardware"));
@@ -773,7 +773,7 @@
return FALSE;
}
break;
- case REND_MODE_RGB:
+ case REND_MODE_RGB: // FIXME To be removed
pie_SetDirect3DDeviceName("RGB Emulation");
if (!pie_Initialise(REND_D3D_RGB))
{
Modified: trunk/src/keyedit.c
===================================================================
--- trunk/src/keyedit.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/keyedit.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -154,7 +154,7 @@
/* Now alter it to the new values */
psMapping->metaKeyCode = metakey;
psMapping->subKeyCode = subkey;
- psMapping->status == KEYMAP_ASSIGNABLE; //must be
+ psMapping->status = KEYMAP_ASSIGNABLE; //must be
if(alt)
{
psMapping->altMetaKeyCode = alt;
Modified: trunk/src/objmem.c
===================================================================
--- trunk/src/objmem.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/objmem.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -285,17 +285,17 @@
{
// do the object died callback
psCBObjDestroyed = psCurr;
- eventFireCallbackTrigger(CALL_OBJ_DESTROYED);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_OBJ_DESTROYED);
switch (psCurr->type)
{
case OBJ_DROID:
- eventFireCallbackTrigger(CALL_DROID_DESTROYED);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_DROID_DESTROYED);
break;
case OBJ_STRUCTURE:
- eventFireCallbackTrigger(CALL_STRUCT_DESTROYED);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_STRUCT_DESTROYED);
break;
case OBJ_FEATURE:
- eventFireCallbackTrigger(CALL_FEATURE_DESTROYED);
+ eventFireCallbackTrigger((TRIGGER_TYPE)CALL_FEATURE_DESTROYED);
break;
}
psCBObjDestroyed = NULL;
@@ -656,7 +656,7 @@
{
psPrev->psNext = psCurr->psNext;
}
- HEAP_FREE(psFlagPosHeap, psCurr);
+ HEAP_FREE(psFlagPosHeap, psCurr); // FIXME bug?
}
}
Modified: trunk/src/text.h
===================================================================
--- trunk/src/text.h 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/text.h 2013-06-18 06:24:27 UTC (rev 49)
@@ -222,11 +222,14 @@
STR_FE_CRAPFOG,
STR_FE_GOODFOG,
+ // Render Options
+ //STR_FE_RENDER
STR_FE_VIDEO,
STR_FE_SOFTWARE,
STR_FE_DIRECTX,
STR_FE_OPENGL,
- STR_FE_GLIDE,
+ STR_FE_GLIDE, // REMOVE
+
STR_FE_GAME,
STR_FE_GRAPHICS,
STR_FE_TEXTURE,
@@ -234,6 +237,12 @@
STR_FE_FOG,
STR_FE_TRANSPARENCY,
+ // Game Resolution
+ //STR_FE_RESOLUTION,
+ //STR_800,
+ //STR_1024,
+ //STR_1280,
+
STR_FE_DIFFICULTY,
STR_EASY,
STR_NORMAL,
Modified: trunk/src/warzoneconfig.h
===================================================================
--- trunk/src/warzoneconfig.h 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/warzoneconfig.h 2013-06-18 06:24:27 UTC (rev 49)
@@ -26,7 +26,7 @@
REND_MODE_GLIDE,
REND_MODE_RGB,
REND_MODE_HAL,
- REND_MODE_HAL2,
+ REND_MODE_OGL,
REND_MODE_REF,
}
WAR_REND_MODE;
Modified: trunk/src/winmain.c
===================================================================
--- trunk/src/winmain.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/winmain.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -139,7 +139,7 @@
}
war_SetDefaultStates();
-
+ // FIXME rewrite next 7 lines to load correct render state. Software, D3D, or OpenGL. Glide is getting removed.
war_SetRendMode(REND_MODE_HAL);
if (InitGlideDLL()) // In ivis02/3dfxdyn.c - returns FALSE if no glide2x.dll is not found
@@ -190,11 +190,7 @@
reInit = FALSE;//just so we dont restart again
-#ifdef USE_FILE_PATH
- _chdir(FILE_PATH);
-#endif
-
- //always start windowed toggle to fullscreen later
+ //always start windowed toggle to fullscreen later. Change to start fullscreen, remove unneeded rendermodes.
if (war_GetRendMode() == REND_MODE_HAL)
{
bGlide = FALSE;
@@ -409,7 +405,7 @@
case FRAME_KILLFOCUS:
paused = TRUE;
gameTimeStop();
- if (pie_GetRenderEngine() == ENGINE_GLIDE)
+ if (pie_GetRenderEngine() == ENGINE_GLIDE) // FIXME swap to OpenGL when added
{
if (!gl_Deactivate())
{
@@ -429,7 +425,7 @@
quit = TRUE;
Restart = TRUE;
}
- if (pie_GetRenderEngine() == ENGINE_GLIDE)
+ if (pie_GetRenderEngine() == ENGINE_GLIDE) // FIXME swap to OpenGL when added
{
if (!gl_Reactivate())
{
Modified: trunk/src/winmain.h
===================================================================
--- trunk/src/winmain.h 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/winmain.h 2013-06-18 06:24:27 UTC (rev 49)
@@ -8,7 +8,6 @@
#define GS_NORMAL 3
#define GS_VIDEO_MODE 4
#define GS_SAVEGAMELOAD 5
-#define FILE_PATH "C:\\Deliverance\\data"
//flag to indicate when initialisation is complete
extern BOOL gameInitialised;
Modified: trunk/src/wrappers.c
===================================================================
--- trunk/src/wrappers.c 2013-05-18 07:11:30 UTC (rev 48)
+++ trunk/src/wrappers.c 2013-06-18 06:24:27 UTC (rev 49)
@@ -243,9 +243,9 @@
// case DEMOMODE:
// runDemoMenu();
// break;
-// case VIDEO:
-// runVideoOptionsMenu();
-// break;
+ case VIDEO:
+ runVideoOptionsMenu();
+ break;
case OPTIONS:
runOptionsMenu();
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2013-05-18 07:11:33
|
Revision: 48
http://sourceforge.net/p/wzredemption/code/48
Author: pheonixstorm
Date: 2013-05-18 07:11:30 +0000 (Sat, 18 May 2013)
Log Message:
-----------
More ifdefs and misc tweaks.
Modified Paths:
--------------
trunk/lib/framework/Framework.vcxproj
trunk/lib/framework/cursor.c
trunk/lib/framework/dderror.c
trunk/lib/framework/debug.c
trunk/lib/framework/frame.c
trunk/lib/framework/image.c
trunk/lib/framework/input.c
trunk/lib/framework/screen.c
trunk/lib/framework/screen.h
trunk/lib/framework/wdg.c
trunk/lib/gamelib/GameLib.vcxproj
trunk/lib/ivis02/Ivis02.vcxproj
trunk/lib/ivis02/tex.c
trunk/lib/netplay/NetPlay.vcxproj
trunk/lib/script/Script.vcxproj
trunk/lib/sequence/Sequence.vcxproj
trunk/lib/sound/Sound.vcxproj
trunk/lib/widget/Widget.vcxproj
Modified: trunk/lib/framework/Framework.vcxproj
===================================================================
--- trunk/lib/framework/Framework.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/Framework.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -74,6 +74,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -101,6 +102,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/lib/framework/cursor.c
===================================================================
--- trunk/lib/framework/cursor.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/cursor.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -6,12 +6,14 @@
*
*/
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
#include <windows.h>
#include <ddraw.h>
#pragma warning (default : 4201 4214 4115)
+#endif
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
Modified: trunk/lib/framework/dderror.c
===================================================================
--- trunk/lib/framework/dderror.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/dderror.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -5,6 +5,7 @@
*
*/
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
@@ -13,6 +14,7 @@
#include <d3d.h>
#include <d3drm.h>
#pragma warning (default : 4201 4214 4115)
+#endif
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
Modified: trunk/lib/framework/debug.c
===================================================================
--- trunk/lib/framework/debug.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/debug.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -9,11 +9,14 @@
#include <stdarg.h>
#include <stdlib.h>
+// First wrap of win32 specific code.. More in the file, but will eventually replace this with custom code.
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
#include <Windows.h>
#pragma warning (default : 4201 4214 4115)
+#endif
#include "frame.h"
#include "frameint.h"
Modified: trunk/lib/framework/frame.c
===================================================================
--- trunk/lib/framework/frame.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/frame.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -14,11 +14,13 @@
// defines the inline functions in this module
#define DEFINE_INLINE
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
#include <windows.h>
#pragma warning (default : 4201 4214 4115)
+#endif
#include <stdio.h>
#include <time.h>
Modified: trunk/lib/framework/image.c
===================================================================
--- trunk/lib/framework/image.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/image.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -5,12 +5,14 @@
*
*/
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
#include <windows.h>
#include <ddraw.h>
#pragma warning (default : 4201 4214 4115)
+#endif
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
Modified: trunk/lib/framework/input.c
===================================================================
--- trunk/lib/framework/input.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/input.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -7,12 +7,14 @@
#include <stdio.h>
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
#include <windows.h>
#include <ddraw.h>
#pragma warning (default : 4201 4214 4115)
+#endif
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
Modified: trunk/lib/framework/screen.c
===================================================================
--- trunk/lib/framework/screen.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/screen.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -7,12 +7,14 @@
#include <stdio.h>
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
#include <windows.h>
#include <ddraw.h>
#pragma warning (default : 4201 4214 4115)
+#endif
#include "frame.h"
#include "frameint.h"
Modified: trunk/lib/framework/screen.h
===================================================================
--- trunk/lib/framework/screen.h 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/screen.h 2013-05-18 07:11:30 UTC (rev 48)
@@ -14,6 +14,7 @@
#error Framework header files MUST be included from Frame.h ONLY.
#endif
+#ifdef WIN32
#pragma warning (disable : 4201 4214 4115 4514)
#define INIT_GUID
#define WIN32_LEAN_AND_MEAN
@@ -21,6 +22,7 @@
#include <windows.h>
#include <ddraw.h>
#pragma warning (default : 4201 4214 4115)
+#endif
#include "types.h"
Modified: trunk/lib/framework/wdg.c
===================================================================
--- trunk/lib/framework/wdg.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/framework/wdg.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -18,7 +18,6 @@
/** local definitions **/
-
//#define PRIMCATALOG // define this if we want to use the primative buffer to store the wdg catalogs - frees up 29k (!)
#define MAX_STR (256)
@@ -37,7 +36,6 @@
/* default settings */
-
/** external functions **/
BOOL FILE_ProcessFile(WRFINFO *CurrentFile, UBYTE *pRetreivedFile);
void SetLastFnameExtra(UBYTE SoftwareFlag, SBYTE TexturePage);
Modified: trunk/lib/gamelib/GameLib.vcxproj
===================================================================
--- trunk/lib/gamelib/GameLib.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/gamelib/GameLib.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -74,6 +74,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -104,6 +105,7 @@
<PrecompiledHeaderOutputFile>$(IntDir)/GameLib.pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/lib/ivis02/Ivis02.vcxproj
===================================================================
--- trunk/lib/ivis02/Ivis02.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/ivis02/Ivis02.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -73,6 +73,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -104,6 +105,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/lib/ivis02/tex.c
===================================================================
--- trunk/lib/ivis02/tex.c 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/ivis02/tex.c 2013-05-18 07:11:30 UTC (rev 48)
@@ -162,7 +162,7 @@
/* If it's not a resource - use old way! - PSX does not need this check because it MUST have been loaded allready by the resource loader */
if(!resPresent("TEXPAGE",filename))
{
- DBERROR(("Texture not in resources; %s.\n", filename));
+ DBERROR(("Texture not in resources: %s.\n", filename));
return(iV_TexLoad( path, filename, type,
palkeep, bColourKeyed ));
}
@@ -239,7 +239,7 @@
i++;
if (i>=_TEX_INDEX)
{
- DBERROR(("Texture not in resources\n",filename));
+ DBERROR(("Texture not in resources: %s.\n",filename));
return -1;
}
}
Modified: trunk/lib/netplay/NetPlay.vcxproj
===================================================================
--- trunk/lib/netplay/NetPlay.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/netplay/NetPlay.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -73,6 +73,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -103,6 +104,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/lib/script/Script.vcxproj
===================================================================
--- trunk/lib/script/Script.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/script/Script.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -69,6 +69,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -102,6 +103,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/lib/sequence/Sequence.vcxproj
===================================================================
--- trunk/lib/sequence/Sequence.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/sequence/Sequence.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -69,6 +69,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -102,6 +103,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/lib/sound/Sound.vcxproj
===================================================================
--- trunk/lib/sound/Sound.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/sound/Sound.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -69,6 +69,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -102,6 +103,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Modified: trunk/lib/widget/Widget.vcxproj
===================================================================
--- trunk/lib/widget/Widget.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
+++ trunk/lib/widget/Widget.vcxproj 2013-05-18 07:11:30 UTC (rev 48)
@@ -69,6 +69,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -102,6 +103,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2013-05-18 07:05:44
|
Revision: 47
http://sourceforge.net/p/wzredemption/code/47
Author: pheonixstorm
Date: 2013-05-18 07:05:41 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Some minor corrections and ifdefs for win32 code
Modified Paths:
--------------
trunk/src/Deliv.rc
trunk/src/Warzone.vcxproj
trunk/src/Warzone.vcxproj.filters
trunk/src/advvis.c
trunk/src/cmddroid.c
trunk/src/cmddroid.h
trunk/src/frontend.c
trunk/src/winmain.c
Modified: trunk/src/Deliv.rc
===================================================================
--- trunk/src/Deliv.rc 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/Deliv.rc 2013-05-18 07:05:41 UTC (rev 47)
@@ -81,8 +81,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,2,43
- PRODUCTVERSION 1,10,2,43
+ FILEVERSION 1,10,2,45
+ PRODUCTVERSION 1,10,2,45
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -99,12 +99,12 @@
BEGIN
VALUE "CompanyName", "DarkStorm Interactive"
VALUE "FileDescription", "Warzone 2100"
- VALUE "FileVersion", "1.10.2.43"
+ VALUE "FileVersion", "1.10.2.45"
VALUE "InternalName", "Warzone 2100"
VALUE "LegalCopyright", "Copyright Pumpkin Studios, EIDOS Interactive 1998"
VALUE "OriginalFilename", "Warzone.exe"
VALUE "ProductName", "Warzone 2100"
- VALUE "ProductVersion", "1.10.2.43"
+ VALUE "ProductVersion", "1.10.2.45"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/Warzone.vcxproj
===================================================================
--- trunk/src/Warzone.vcxproj 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/Warzone.vcxproj 2013-05-18 07:05:41 UTC (rev 47)
@@ -81,6 +81,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -134,6 +135,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1213,15 +1215,6 @@
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="Water.c">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
<ClCompile Include="WinMain.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Modified: trunk/src/Warzone.vcxproj.filters
===================================================================
--- trunk/src/Warzone.vcxproj.filters 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/Warzone.vcxproj.filters 2013-05-18 07:05:41 UTC (rev 47)
@@ -366,9 +366,6 @@
<ClCompile Include="warzoneConfig.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Water.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="WinMain.c">
<Filter>Source Files</Filter>
</ClCompile>
Modified: trunk/src/advvis.c
===================================================================
--- trunk/src/advvis.c 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/advvis.c 2013-05-18 07:05:41 UTC (rev 47)
@@ -195,12 +195,13 @@
{
bRevealActive = val;
}
+
// ------------------------------------------------------------------------------------
void preProcessVisibility( void )
{
UDWORD i,j;
MAPTILE *psTile;
-STRUCTURE *psStruct;
+//STRUCTURE *psStruct;
//FEATURE *psFeature;
for(i=0; i<mapWidth;i++)
@@ -244,4 +245,3 @@
}
-// ------------------------------------------------------------------------------------
Modified: trunk/src/cmddroid.c
===================================================================
--- trunk/src/cmddroid.c 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/cmddroid.c 2013-05-18 07:05:41 UTC (rev 47)
@@ -110,7 +110,7 @@
apsCmdDesignator[psDroid->player] = psDroid;
}
-// set the current target designator for a player
+// clear the current target designator for a player
void cmdDroidClearDesignator(UDWORD player)
{
apsCmdDesignator[player] = NULL;
Modified: trunk/src/cmddroid.h
===================================================================
--- trunk/src/cmddroid.h 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/cmddroid.h 2013-05-18 07:05:41 UTC (rev 47)
@@ -74,5 +74,3 @@
#endif
-
-
Modified: trunk/src/frontend.c
===================================================================
--- trunk/src/frontend.c 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/frontend.c 2013-05-18 07:05:41 UTC (rev 47)
@@ -51,7 +51,7 @@
#include "multistat.h"
#include "netplay.h"
-#define VERSION_STRING "VER 1.10.2.43"
+#define VERSION_STRING "VER 1.10.2.45"
extern BOOL bSubtitles;
Modified: trunk/src/winmain.c
===================================================================
--- trunk/src/winmain.c 2012-11-28 13:25:22 UTC (rev 46)
+++ trunk/src/winmain.c 2013-05-18 07:05:41 UTC (rev 47)
@@ -7,7 +7,10 @@
// multidemo - used with covermount to make a multiplayer demo.
//
+#ifdef win32
#include <direct.h>
+#endif
+
#include "frame.h"
#include "widget.h"
#include "script.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-28 13:25:32
|
Revision: 46
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=46&view=rev
Author: pheonixstorm
Date: 2012-11-28 13:25:22 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Forgot to update project files
Modified Paths:
--------------
trunk/lib/gamelib/GameLib.vcxproj
trunk/lib/gamelib/GameLib.vcxproj.filters
trunk/src/Warzone.vcxproj
trunk/src/Warzone.vcxproj.filters
Modified: trunk/lib/gamelib/GameLib.vcxproj
===================================================================
--- trunk/lib/gamelib/GameLib.vcxproj 2012-11-28 13:19:26 UTC (rev 45)
+++ trunk/lib/gamelib/GameLib.vcxproj 2012-11-28 13:25:22 UTC (rev 46)
@@ -194,7 +194,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Ani.h" />
<ClInclude Include="Anim.h" />
<ClInclude Include="Animobj.h" />
<ClInclude Include="GTime.h" />
Modified: trunk/lib/gamelib/GameLib.vcxproj.filters
===================================================================
--- trunk/lib/gamelib/GameLib.vcxproj.filters 2012-11-28 13:19:26 UTC (rev 45)
+++ trunk/lib/gamelib/GameLib.vcxproj.filters 2012-11-28 13:25:22 UTC (rev 46)
@@ -37,9 +37,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Ani.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="Anim.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/src/Warzone.vcxproj
===================================================================
--- trunk/src/Warzone.vcxproj 2012-11-28 13:19:26 UTC (rev 45)
+++ trunk/src/Warzone.vcxproj 2012-11-28 13:25:22 UTC (rev 46)
@@ -1246,6 +1246,7 @@
<ClInclude Include="AdvVis.h" />
<ClInclude Include="Ai.h" />
<ClInclude Include="AIDef.h" />
+ <ClInclude Include="ani.h" />
<ClInclude Include="Anim_id.h" />
<ClInclude Include="Arrow.h" />
<ClInclude Include="AStar.h" />
Modified: trunk/src/Warzone.vcxproj.filters
===================================================================
--- trunk/src/Warzone.vcxproj.filters 2012-11-28 13:19:26 UTC (rev 45)
+++ trunk/src/Warzone.vcxproj.filters 2012-11-28 13:25:22 UTC (rev 46)
@@ -794,6 +794,9 @@
<ClInclude Include="Wrappers.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ani.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="cur00001.cur">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-28 13:19:33
|
Revision: 45
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=45&view=rev
Author: pheonixstorm
Date: 2012-11-28 13:19:26 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Moved ani.h over to src were it belongs
Added Paths:
-----------
trunk/src/ani.h
Removed Paths:
-------------
trunk/lib/gamelib/ani.h
Deleted: trunk/lib/gamelib/ani.h
===================================================================
--- trunk/lib/gamelib/ani.h 2012-11-28 04:34:41 UTC (rev 44)
+++ trunk/lib/gamelib/ani.h 2012-11-28 13:19:26 UTC (rev 45)
@@ -1,27 +0,0 @@
-/***************************************************************************/
-/*
- * Ani.h
- *
- * Warzone animation function wrappers
- *
- * Gareth Jones 16/12/97
- */
-/***************************************************************************/
-
-#ifndef _ANI_H_
-#define _ANI_H_
-
-/***************************************************************************/
-
-#include "frame.h"
-#include "anim.h"
-
-/***************************************************************************/
-
-void * anim_GetShapeFunc( STRING * pStr );
-
-/***************************************************************************/
-
-#endif /* _ANI_H_ */
-
-/***************************************************************************/
Copied: trunk/src/ani.h (from rev 44, trunk/lib/gamelib/ani.h)
===================================================================
--- trunk/src/ani.h (rev 0)
+++ trunk/src/ani.h 2012-11-28 13:19:26 UTC (rev 45)
@@ -0,0 +1,27 @@
+/***************************************************************************/
+/*
+ * Ani.h
+ *
+ * Warzone animation function wrappers
+ *
+ * Gareth Jones 16/12/97
+ */
+/***************************************************************************/
+
+#ifndef _ANI_H_
+#define _ANI_H_
+
+/***************************************************************************/
+
+#include "frame.h"
+#include "anim.h"
+
+/***************************************************************************/
+
+void * anim_GetShapeFunc( STRING * pStr );
+
+/***************************************************************************/
+
+#endif /* _ANI_H_ */
+
+/***************************************************************************/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-28 04:34:48
|
Revision: 44
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=44&view=rev
Author: pheonixstorm
Date: 2012-11-28 04:34:41 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Increase single player unit limit to 140. Removed another demo section I missed.
Modified Paths:
--------------
trunk/src/structure.c
Modified: trunk/src/structure.c
===================================================================
--- trunk/src/structure.c 2012-11-22 04:48:14 UTC (rev 43)
+++ trunk/src/structure.c 2012-11-28 04:34:41 UTC (rev 44)
@@ -197,13 +197,6 @@
// (for example used to change the type of wall at a location)
//BOOL removeStruct(STRUCTURE *psDel);
-//#ifdef DEMO
-//BOOL demoStructs(void);
-//BOOL createStructureStat(STRUCTURE_STATS *psBuilding, STRUCTURE_STATS *psNewStructure,
-// UDWORD ref, STRING *pName, UDWORD type);
-//void printAvailStructs(void);
-//#endif
-
/* New function from Alex M */
/* Tells you if a point is inside the footprint of a building */
@@ -3707,9 +3700,8 @@
// Disallow manufacture of units once these limits are reached,
// dos'nt mean that these numbers can't be exceeded if units are
// put down in the editor or by the scripts.
-static UWORD MaxDroidsAllowedPerPlayer[MAX_PLAYERS]={100,999,999,999,999,999,999,999};
+static UWORD MaxDroidsAllowedPerPlayer[MAX_PLAYERS]={140,999,999,999,999,999,999,999};
static UWORD MaxDroidsAllowedPerPlayerMultiPlayer[MAX_PLAYERS]={300,300,300,300,300,300,300,300};
-//static UWORD MaxDroidsAllowedPerPlayerMultiPlayer[MAX_PLAYERS]={10,10,10,10,10,10,10,10};
UDWORD getMaxStructures(UDWORD PlayerNumber)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-22 04:48:20
|
Revision: 43
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=43&view=rev
Author: pheonixstorm
Date: 2012-11-22 04:48:14 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Enabled mousewheel support for map zooming
Modified Paths:
--------------
trunk/lib/framework/input.c
trunk/lib/framework/input.h
trunk/src/Deliv.rc
trunk/src/display.c
trunk/src/frontend.c
Modified: trunk/lib/framework/input.c
===================================================================
--- trunk/lib/framework/input.c 2012-11-20 06:06:52 UTC (rev 42)
+++ trunk/lib/framework/input.c 2012-11-22 04:48:14 UTC (rev 43)
@@ -44,7 +44,7 @@
static KEY_STATE aKeyState[KEY_MAXSCAN];
/* Mouse wheel stuff */
-// static SDWORD wheelVal; // ADD FIXME Use this val when mouse rotate function found
+static int wheelVal; // Wheel zoom code added, though unsure if correctly or working yet... Nope.. locks up the game :(
static UDWORD oldWheelPos = 0;
static BOOL bMouseWheelForward = FALSE;
static BOOL bMouseWheelBackwards = FALSE;
@@ -244,30 +244,22 @@
}
break;
- /* FIXME Can be enabled soon I hope.
+ // FIXME Can be enabled soon I hope.
case WM_MOUSEWHEEL: // not defined in non-NT.....bugger.
- wheelVal = HIWORD(wParam);
+ wheelVal = (short)HIWORD(wParam); //GET_WHEEL_DELTA_WPARAM(wParam);
if(wheelVal<0)
{
- bMouseWheelForward = TRUE;
- bMouseWheelBackwards = FALSE;
- bMouseWheelStatic = FALSE;
- }
- if(wheelVal>0)
- {
- bMouseWheelForward = FALSE;
+ bMouseWheelForward = FALSE;
bMouseWheelBackwards = TRUE;
bMouseWheelStatic = FALSE;
}
- else
- {
- bMouseWheelForward = FALSE;
+ else
+ {
+ bMouseWheelForward = TRUE;
bMouseWheelBackwards = FALSE;
- bMouseWheelStatic = TRUE;
- }
-
+ bMouseWheelStatic = FALSE;
+ }
break;
- */
case WM_KEYUP:
case WM_SYSKEYUP:
@@ -520,6 +512,13 @@
return(bMouseWheelStatic);
}
+void mouseWheelReset(void)
+{
+ bMouseWheelForward = FALSE;
+ bMouseWheelBackwards = FALSE;
+ bMouseWheelStatic = TRUE;
+}
+
/* This returns true if the mouse key is currently depressed */
BOOL mouseDown(MOUSE_KEY_CODE code)
{
Modified: trunk/lib/framework/input.h
===================================================================
--- trunk/lib/framework/input.h 2012-11-20 06:06:52 UTC (rev 42)
+++ trunk/lib/framework/input.h 2012-11-22 04:48:14 UTC (rev 43)
@@ -159,6 +159,7 @@
extern BOOL mouseWheelForward( void);
extern BOOL mouseWheelBackwards( void);
extern BOOL mouseWheelStatic( void);
+extern void mouseWheelReset(void);
/* This returns true if the mouse key is currently depressed */
Modified: trunk/src/Deliv.rc
===================================================================
--- trunk/src/Deliv.rc 2012-11-20 06:06:52 UTC (rev 42)
+++ trunk/src/Deliv.rc 2012-11-22 04:48:14 UTC (rev 43)
@@ -81,8 +81,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,1,42
- PRODUCTVERSION 1,10,1,42
+ FILEVERSION 1,10,2,43
+ PRODUCTVERSION 1,10,2,43
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -99,12 +99,12 @@
BEGIN
VALUE "CompanyName", "DarkStorm Interactive"
VALUE "FileDescription", "Warzone 2100"
- VALUE "FileVersion", "1.10.1.42"
+ VALUE "FileVersion", "1.10.2.43"
VALUE "InternalName", "Warzone 2100"
VALUE "LegalCopyright", "Copyright Pumpkin Studios, EIDOS Interactive 1998"
VALUE "OriginalFilename", "Warzone.exe"
VALUE "ProductName", "Warzone 2100"
- VALUE "ProductVersion", "1.10.1.42"
+ VALUE "ProductVersion", "1.10.2.43"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/display.c
===================================================================
--- trunk/src/display.c 2012-11-20 06:06:52 UTC (rev 42)
+++ trunk/src/display.c 2012-11-22 04:48:14 UTC (rev 43)
@@ -537,6 +537,7 @@
{
UDWORD x,y;
BOOL mOverR = FALSE;
+ UDWORD WheelCount;
x = mouseX();
y = mouseY();
@@ -577,6 +578,20 @@
camToggleStatus();
}
+ if (mouseWheelForward())
+ {
+ for (WheelCount = 0; WheelCount < 20; WheelCount++)
+ { kf_ZoomIn(); }
+ mouseWheelReset();
+ }
+
+ if (mouseWheelBackwards())
+ {
+ for (WheelCount = 0; WheelCount < 20; WheelCount++)
+ { kf_ZoomOut(); }
+ mouseWheelReset();
+ }
+
if(intMode != INT_DESIGN)
{
if(bAllowOtherKeyPresses)
Modified: trunk/src/frontend.c
===================================================================
--- trunk/src/frontend.c 2012-11-20 06:06:52 UTC (rev 42)
+++ trunk/src/frontend.c 2012-11-22 04:48:14 UTC (rev 43)
@@ -51,7 +51,7 @@
#include "multistat.h"
#include "netplay.h"
-#define VERSION_STRING "VER 1.10.1.42"
+#define VERSION_STRING "VER 1.10.2.43"
extern BOOL bSubtitles;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-20 06:07:04
|
Revision: 42
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=42&view=rev
Author: pheonixstorm
Date: 2012-11-20 06:06:52 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Added 2 new difficulty levels, fixed up cheats.
* Try elite and killer via console cheat interface
* Reorganized keybind.c for cheats, debug, unknown, and std keymap functions
* Reenabled a few cheats and fixed a few issues with some others.
* Cheats are now text and not xored
Modified Paths:
--------------
trunk/src/Deliv.rc
trunk/src/cheat.c
trunk/src/difficulty.c
trunk/src/difficulty.h
trunk/src/frontend.c
trunk/src/keybind.c
trunk/src/keybind.h
trunk/src/text.h
Modified: trunk/src/Deliv.rc
===================================================================
--- trunk/src/Deliv.rc 2012-11-16 21:11:22 UTC (rev 41)
+++ trunk/src/Deliv.rc 2012-11-20 06:06:52 UTC (rev 42)
@@ -81,8 +81,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,1,31
- PRODUCTVERSION 1,10,1,31
+ FILEVERSION 1,10,1,42
+ PRODUCTVERSION 1,10,1,42
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -99,12 +99,12 @@
BEGIN
VALUE "CompanyName", "DarkStorm Interactive"
VALUE "FileDescription", "Warzone 2100"
- VALUE "FileVersion", "1.10.1.31"
+ VALUE "FileVersion", "1.10.1.42"
VALUE "InternalName", "Warzone 2100"
VALUE "LegalCopyright", "Copyright Pumpkin Studios, EIDOS Interactive 1998"
VALUE "OriginalFilename", "Warzone.exe"
VALUE "ProductName", "Warzone 2100"
- VALUE "ProductVersion", "1.10.1.31"
+ VALUE "ProductVersion", "1.10.1.42"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/cheat.c
===================================================================
--- trunk/src/cheat.c 2012-11-16 21:11:22 UTC (rev 41)
+++ trunk/src/cheat.c 2012-11-20 06:06:52 UTC (rev 42)
@@ -14,44 +14,82 @@
void (*function)(void); // pointer to void* function
} CHEAT_ENTRY;
+/* Non Xor cheat list. Run if/else to switch between or remove xor section ?? */
CHEAT_ENTRY cheatCodes[] =
{
-// {"OPHZM",kf_TogglePower}, //power
-// {"VQKZMY^\\Z",kf_ToggleOverlays},//interface
-// {"XVIZ ^SS",kf_AllAvailable}, // give all
-// {"LWPH R^OOVQXL",kf_ShowMappings},//show mappings
-// {"KZROS^KZL",kf_GiveTemplateSet},//templates
-// {"LZSZ\\K ^SS",kf_SelectAllCombatUnits},//select all
-// {"YMPR ^]PIZ",kf_ToggleGodMode},//from above
-// {"SZK KWZMZ ]Z SVXWK",kf_RecalcLighting},//let there be light
-// {"YVQVLW QPH",kf_FinishResearch},//finish now
+// {"VQKZMY^\\Z",kf_ToggleOverlays}, //interface
+ {"give all",kf_AllAvailable}, // give all TEST FUNCTION - MAKE EVERYTHING AVAILABLE
+// {"LWPH R^OOVQXL",kf_ShowMappings}, // show mappings - Dumps all the keyboard mappings to the console display
+// {"KZROS^KZL",kf_GiveTemplateSet}, // templates - ?? unknown
+// {"LZSZ\\K ^SS",kf_SelectAllCombatUnits},// select all
+ {"from above",kf_ToggleGodMode}, // from above - god mode (Not sure what it does...)
+// {"SZK KWZMZ ]Z SVXWK",kf_RecalcLighting},// let there be light - Recalculates the lighting values for a tile
// {"PJKSVQZ,",kf_ToggleOutline},
-// {"L\\MZZQ[JRO",kf_ScreenDump}, //screendump
-// {"M^QXZL",kf_ToggleSensorDisplay},//ranges
-// {"JQVK LK^KL",kf_DebugDroidInfo},//unit stats
+// {"L\\MZZQ[JRO",kf_ScreenDump}, // screendump
+// {"M^QXZL",kf_ToggleSensorDisplay}, // ranges ?? not defined
+ {"udriveit",kf_ToggleDrivingMode}, // udriveit - Driving mode, use at your own risk!!
+ {"unit stats",kf_DebugDroidInfo}, // unit stats - Writes out debug info about all the selected droids
+ {"show me the power",kf_UpThePower}, // show me the power - 1000 extra power kf_UpThePower
+ {"hallo mein schatz",kf_AddMissionOffWorld},// hallo mein schatz - Tell the scripts to start a mission
+ {"timedemo",kf_FrameRate}, // timedemo - View frame rate and graphics engine data
+ {"kill selected",kf_KillSelected}, // kill selected - kills the selected units
+ {"john kettley",kf_ToggleWeather}, // john kettley - toggle weather rain,snow,clear
+ {"how fast",kf_FrameRate}, // how fast?
+ {"shakey",kf_ToggleShakeStatus}, // shakey - Toggles screen shaking when unit explodes
+ {"mouseflip",kf_ToggleMouseInvert}, // mouseflip
+ {"double up",kf_SetDoubleUnitsLevel}, // double up - harder units
+ {"biffer baker",kf_SetBakerLevel}, // biffer baker - almost invulnerable
+ {"easy",kf_SetEasyLevel}, // easy - sets easy difficulty level.
+ {"normal",kf_SetNormalLevel}, // normal - sets normal difficulty level
+ {"hard",kf_SetHardLevel}, // hard - sets hard difficulty level
+ {"elite",kf_SetToughUnitsLevel}, // elite - something new
+ {"killer",kf_SetKillerLevel}, // killer - gamer suicide
+ {"whale fin",kf_TogglePower}, // whale fin - turns on/off infinte power
+ {"get off my land",kf_KillEnemy}, // get off my land - kills all enemy units on map
+ {"version",kf_BuildInfo}, // version - tells you when the game code was compiled
+ {"time toggle",kf_ToggleMissionTimer}, // time toggle - starts, stops timer
+ {"work harder",kf_FinishResearch}, // work harder - completes all research
+ {"carol vorderman",kf_NoFaults}, // carol vorderman
+ {"end of list",NULL}
+};
- {"W^SSP RZVQ L\\W^KE",kf_AddMissionOffWorld},//let me win
- {"KVRZ[ZRP",kf_FrameRate}, //timedemo
- {"TVSS LZsZ\\KZ[",kf_KillSelected},//kill slected
- {"UPWQ TZKKSZF",kf_ToggleWeather},//john kettley
- {"WPH Y^LK",kf_FrameRate},//how fast?
- {"LW^TZF",kf_ToggleShakeStatus},//shakey
- {"RPJLZYSVO",kf_ToggleMouseInvert},//mouseflip
- {"]VYYZM ]^TZM",kf_SetKillerLevel},//biffa
- {"LO^MTSZ XMZZQ",kf_SetKillerLevel}, //biffa
- {"Z^LF",kf_SetEasyLevel},//easy
- {"QPMR^S",kf_SetNormalLevel},//normal
- {"W^M[",kf_SetHardLevel},//hard
- {"[PJ]SZ JO",kf_SetToughUnitsLevel}, // your units take half the damage
- {"HW^SZ YVQ",kf_TogglePower}, // turns on/off infinte power
- {"XZK PYY RF S^Q[",kf_KillEnemy}, // kills all enemy units and structures
- {"IZMLVPQ",kf_BuildInfo}, // tells you when the game was built
- {"KVRZ KPXXSZ",kf_ToggleMissionTimer},
- {"HPMT W^M[ZM",kf_FinishResearch},
- {"\\^MPS IPM[ZMR^Q",kf_NoFaults},//carol vorderman
+/*
+CHEAT_ENTRY cheatCodes[] =
+{
+// {"VQKZMY^\\Z",kf_ToggleOverlays}, //interface
+// {"XVIZ ^SS",kf_AllAvailable}, // give all TEST FUNCTION - MAKE EVERYTHING AVAILABLE
+// {"LWPH R^OOVQXL",kf_ShowMappings}, // show mappings - Dumps all the keyboard mappings to the console display
+// {"KZROS^KZL",kf_GiveTemplateSet}, // templates - ?? unknown
+// {"LZSZ\\K ^SS",kf_SelectAllCombatUnits},// select all
+// {"YMPR ^]PIZ",kf_ToggleGodMode}, // from above - god mode
+// {"SZK KWZMZ ]Z SVXWK",kf_RecalcLighting},// let there be light - Recalculates the lighting values for a tile
+// {"PJKSVQZ,",kf_ToggleOutline},
+// {"L\\MZZQ[JRO",kf_ScreenDump}, // screendump
+// {"M^QXZL",kf_ToggleSensorDisplay}, // ranges ?? not defined
+// {"JQVK LK^KL",kf_DebugDroidInfo}, // unit stats - Writes out debug info about all the selected droids
+
+ {"W^SSP RZVQ L\\W^KE",kf_AddMissionOffWorld},// hallo mein schatz - Tell the scripts to start a mission
+ {"KVRZ[ZRP",kf_FrameRate}, // timedemo
+ {"TVSS LZsZ\\KZ[",kf_KillSelected}, // kill selected - kills the selected units
+ {"UPWQ TZKKSZF",kf_ToggleWeather}, // john kettley - toggle weather rain,snow,clear
+ {"WPH Y^LK",kf_FrameRate}, // how fast?
+ {"LW^TZF",kf_ToggleShakeStatus}, // shakey - Toggles screen shaking when unit explodes
+ {"RPJLZYSVO",kf_ToggleMouseInvert}, // mouseflip
+ {"]VYYZM ]^TZM",kf_SetKillerLevel}, // biffer baker - almost invulnerable ?? Why 2
+ {"LO^MTSZ XMZZQ",kf_SetKillerLevel}, // biffer baker - almost invulnerable ?? sparkle green?
+ {"Z^LF",kf_SetEasyLevel}, // easy - sets easy difficulty level.
+ {"QPMR^S",kf_SetNormalLevel}, // normal - sets normal difficulty level
+ {"W^M[",kf_SetHardLevel}, // hard - sets hard difficulty level
+ {"[PJ]SZ JO",kf_SetToughUnitsLevel}, // double up - harder units
+ {"HW^SZ YVQ",kf_TogglePower}, // whale fin - turns on/off infinte power
+ {"XZK PYY RF S^Q[",kf_KillEnemy}, // get off my land - kills all enemy units on map
+ {"IZMLVPQ",kf_BuildInfo}, // version - tells you when the game code was compiled
+ {"KVRZ KPXXSZ",kf_ToggleMissionTimer}, // time toggle - starts, stops timer
+ {"HPMT W^M[ZM",kf_FinishResearch}, // work harder - completes all research
+ {"\\^MPS IPM[ZMR^Q",kf_NoFaults}, // carol vorderman
{"end of list",NULL}
};
-
+*/
unsigned char cheatString[255];
unsigned char *xorString(unsigned char *string)
@@ -92,7 +130,7 @@
while(cheatCodes[index].function!=NULL)
{
strcpy(cheatString,cheatCodes[index].pName);
- xored = xorString(cheatString);
+ xored = cheatString; //xorString(cheatString);
if(strcmp(pName,xored) == FALSE) // strcmp oddity
{
/* We've got our man... */
Modified: trunk/src/difficulty.c
===================================================================
--- trunk/src/difficulty.c 2012-11-16 21:11:22 UTC (rev 41)
+++ trunk/src/difficulty.c 2012-11-20 06:06:52 UTC (rev 42)
@@ -50,14 +50,23 @@
fDifPlayerModifier = FRACTCONST(80,100);
fDifEnemyModifier = FRACTCONST(100,100);
break;
+ case DL_TOUGH:
+ fDifPlayerModifier = FRACTCONST(80,100);
+ fDifEnemyModifier = FRACTCONST(120,100);
+ break;
case DL_KILLER:
+ fDifPlayerModifier = FRACTCONST(80,100);
+ fDifEnemyModifier = FRACTCONST(160,100);
+ break;
+ case DL_DOUBLE:
+ fDifPlayerModifier = FRACTCONST(100,100);
+ fDifEnemyModifier = FRACTCONST(50,100);
+ break;
+ case DL_BBAKER:
fDifPlayerModifier = FRACTCONST(999,100); // 10 times
fDifEnemyModifier = FRACTCONST(1,100); // almost nothing
break;
- case DL_TOUGH:
- fDifPlayerModifier = FRACTCONST(100,100);
- fDifEnemyModifier = FRACTCONST(50,100); // they do less damage!
- break;
+
default:
DBERROR(("Invalid difficulty level selected - forcing NORMAL"));
break;
Modified: trunk/src/difficulty.h
===================================================================
--- trunk/src/difficulty.h 2012-11-16 21:11:22 UTC (rev 41)
+++ trunk/src/difficulty.h 2012-11-20 06:06:52 UTC (rev 42)
@@ -7,7 +7,9 @@
DL_NORMAL,
DL_HARD,
DL_TOUGH,
-DL_KILLER
+DL_KILLER,
+DL_DOUBLE,
+DL_BBAKER
} DIFFICULTY_LEVEL;
extern void setDifficultyLevel( DIFFICULTY_LEVEL lev);
Modified: trunk/src/frontend.c
===================================================================
--- trunk/src/frontend.c 2012-11-16 21:11:22 UTC (rev 41)
+++ trunk/src/frontend.c 2012-11-20 06:06:52 UTC (rev 42)
@@ -51,7 +51,7 @@
#include "multistat.h"
#include "netplay.h"
-#define VERSION_STRING "VER 1.10.1.31"
+#define VERSION_STRING "VER 1.10.1.42"
extern BOOL bSubtitles;
@@ -1285,7 +1285,7 @@
addTopForm();
addBottomForm();
- // difficulty
+ // difficulty FIXME for new difficulty settings see text.h line 241 and 242 for STR_TOUGH STR_KILLER
addTextButton(FRONTEND_DIFFICULTY, FRONTEND_POS2X-25,FRONTEND_POS2Y, strresGetString(psStringRes, STR_FE_DIFFICULTY),TRUE,FALSE);
switch(getDifficultyLevel())
{
@@ -1747,7 +1747,7 @@
case REND_MODE_HAL:
if(weHave3DNow())
{
- sprintf(sTmp, VERSION_STRING " - Build: %s D3D (With AMD 3DNow! and SSE2)",__DATE__);
+ sprintf(sTmp, VERSION_STRING " - Build: %s D3D (With AMD 3DNow!)",__DATE__);
}
else
{
Modified: trunk/src/keybind.c
===================================================================
--- trunk/src/keybind.c 2012-11-16 21:11:22 UTC (rev 41)
+++ trunk/src/keybind.c 2012-11-20 06:06:52 UTC (rev 42)
@@ -1,3 +1,10 @@
+/*
+ KeyBind.c
+ Holds all the functions that can be mapped to a key.
+ All functions at the moment must be 'void func(void)'.
+ Alex McLean, Pumpkin Studios, EIDOS Interactive.
+*/
+
#include "frame.h"
#include "objects.h"
#include "base.h"
@@ -83,167 +90,185 @@
void kfsf_SelectAllSameProp ( PROPULSION_TYPE propType );
void kfsf_SelectAllSameName ( STRING *droidName );
void kfsf_SetSelectedDroidsState( SECONDARY_ORDER sec, SECONDARY_STATE State );
-/*
- KeyBind.c
- Holds all the functions that can be mapped to a key.
- All functions at the moment must be 'void func(void)'.
- Alex McLean, Pumpkin Studios, EIDOS Interactive.
-*/
+/*
+ *
+ * Cheat Functions
+ *
+ */
+
// --------------------------------------------------------------------------
-void kf_ToggleMissionTimer( void )
+// carol vorderman
+void kf_NoFaults( void )
{
- if(mission.cheatTime)
+ audio_QueueTrack( ID_SOUND_NOFAULTS );
+}
+
+// --------------------------------------------------------------------------
+// work harder - completes all research
+void kf_FinishResearch( void )
+{
+ STRUCTURE *psCurr;
+
+ //for (psCurr=apsStructLists[selectedPlayer]; psCurr; psCurr = psCurr->psNext)
+ for (psCurr=interfaceStructList(); psCurr; psCurr = psCurr->psNext)
{
- setMissionCheatTime(FALSE);
+ if (psCurr->pStructureType->type == REF_RESEARCH)
+ {
+ //((RESEARCH_FACILITY *)psCurr->pFunctionality)->timeStarted = 0;
+ ((RESEARCH_FACILITY *)psCurr->pFunctionality)->timeStarted = gameTime + 100000;
+ //set power accrued to high value so that will trigger straight away
+ ((RESEARCH_FACILITY *)psCurr->pFunctionality)->powerAccrued = 10000;
+ }
}
- else
- {
- setMissionCheatTime(TRUE);
- }
}
+
// --------------------------------------------------------------------------
-void kf_ToggleRadarJump( void )
+// time toggle - starts, stops timer
+void kf_ToggleMissionTimer( void )
{
- if(getRadarJumpStatus())
+ if(mission.cheatTime)
{
- setRadarJump(FALSE);
+ setMissionCheatTime(FALSE);
}
else
{
- setRadarJump(TRUE);
+ setMissionCheatTime(TRUE);
}
}
+
// --------------------------------------------------------------------------
-void kf_NoFaults( void )
+// version - tells you when the game code was compiled
+void kf_BuildInfo( void )
{
- audio_QueueTrack( ID_SOUND_NOFAULTS );
+ CONPRINTF(ConsoleString,(ConsoleString,"Built at %s on %s",__TIME__,__DATE__));
}
+
// --------------------------------------------------------------------------
-
-void kf_ToggleDimension( void )
+// get off my land - kills all enemy units on map (was units & structures)
+void kf_KillEnemy( void )
{
- display3D = FALSE;
- intSetMapPos(player.p.x + ((visibleXTiles/2) << TILE_SHIFT),
- player.p.z + ((visibleYTiles/2) << TILE_SHIFT));
-}
+UDWORD player;
+DROID *psCDroid,*psNDroid;
+STRUCTURE *psCStruct, *psNStruct;
-// --------------------------------------------------------------------------
-/* Halves all the heights of the map tiles */
-void kf_HalveHeights( void )
-{
-UDWORD i,j;
-MAPTILE *psTile;
-
- for (i=0; i<mapWidth; i++)
+ for(player = 0; player<MAX_PLAYERS AND !bMultiPlayer; player++)
+ {
+ if(player!=selectedPlayer)
{
- for (j=0; j<mapHeight; j++)
+ // wipe out all the droids
+ for(psCDroid=apsDroidLists[player]; psCDroid; psCDroid=psNDroid)
{
- psTile = mapTile(i,j);
- psTile->height/=2;;
+ psNDroid = psCDroid->psNext;
+ destroyDroid(psCDroid);
}
+ // wipe out all their structures
+ // for(psCStruct=apsStructLists[player]; psCStruct; psCStruct=psNStruct)
+ // {
+ // psNStruct = psCStruct->psNext;
+ // destroyStruct(psCStruct);
+ // }
}
+ }
}
// --------------------------------------------------------------------------
-void kf_FaceNorth(void)
+// whale fin - turns on/off infinte power
+void kf_TogglePower( void )
{
- player.r.y = 0;
- if(getWarCamStatus())
- {
- camToggleStatus();
- }
+#ifndef DEBUG
+if(bMultiPlayer)
+{
+ return;
}
+#endif
+ powerCalculated = !powerCalculated;
+ if (powerCalculated)
+ {
+ addConsoleMessage("Infinite power disabled",DEFAULT_JUSTIFY);
+ powerCalc(TRUE);
+ }
+ else
+ {
+ addConsoleMessage("Infinite power enabled",DEFAULT_JUSTIFY);
+ }
+}
+
// --------------------------------------------------------------------------
-void kf_FaceSouth(void)
+void kf_SetDoubleUnitsLevel( void )
{
- player.r.y = DEG(180);
- if(getWarCamStatus())
+ if(!bMultiPlayer|| (NetPlay.bComms == 0))
{
- camToggleStatus();
+ setDifficultyLevel(DL_DOUBLE);
+ addConsoleMessage("Twice as nice!",LEFT_JUSTIFY);
}
}
+
// --------------------------------------------------------------------------
-void kf_FaceEast(void)
+// biffer baker - almost god like damage
+void kf_SetBakerLevel( void )
{
- player.r.y = DEG(90);
- if(getWarCamStatus())
+ if(!bMultiPlayer || (NetPlay.bComms == 0))
{
- camToggleStatus();
+ setDifficultyLevel(DL_BBAKER);
+ addConsoleMessage("Hard as nails!!!",LEFT_JUSTIFY);
}
}
+
// --------------------------------------------------------------------------
-void kf_FaceWest(void)
+void kf_SetEasyLevel( void )
{
- player.r.y = DEG(270);
- if(getWarCamStatus())
+ if(!bMultiPlayer|| (NetPlay.bComms == 0))
{
- camToggleStatus();
+ setDifficultyLevel(DL_EASY);
+ addConsoleMessage("Takings thing easy!",LEFT_JUSTIFY);
}
}
-// --------------------------------------------------------------------------
-/* Writes out debug info about all the selected droids */
-void kf_DebugDroidInfo( void )
-{
-DROID *psDroid;
-
- for(psDroid = apsDroidLists[selectedPlayer]; psDroid; psDroid=psDroid->psNext)
- {
- if (psDroid->selected)
- {
- printDroidInfo(psDroid);
- }
- }
-}
-
// --------------------------------------------------------------------------
-//
-///* Prints out the date and time of the build of the game */
-void kf_BuildInfo( void )
+void kf_SetNormalLevel( void )
{
- CONPRINTF(ConsoleString,(ConsoleString,"Built at %s on %s",__TIME__,__DATE__));
+ if(!bMultiPlayer|| (NetPlay.bComms == 0))
+ {
+ setDifficultyLevel(DL_NORMAL);
+ addConsoleMessage("Back to normality!",LEFT_JUSTIFY);
+ }
}
// --------------------------------------------------------------------------
-
-/* Toggles whether the windows surface gets updated */
-void kf_UpdateWindow( void )
+void kf_SetHardLevel( void )
{
- updateVideoCard = !updateVideoCard;
- addConsoleMessage("Windows surface update toggled",DEFAULT_JUSTIFY);
+ if(!bMultiPlayer|| (NetPlay.bComms == 0))
+ {
+ setDifficultyLevel(DL_HARD);
+ addConsoleMessage("Getting tricky!",LEFT_JUSTIFY);
+ }
}
// --------------------------------------------------------------------------
-void kf_ToggleConsoleDrop( void )
+void kf_SetToughUnitsLevel( void )
{
- if(!bInTutorial)
+ if(!bMultiPlayer|| (NetPlay.bComms == 0))
{
- toggleConsoleDrop();
+ setDifficultyLevel(DL_TOUGH);
+ addConsoleMessage("Fall in marines!",LEFT_JUSTIFY);
}
}
+
// --------------------------------------------------------------------------
-void kf_SetKillerLevel( void ) // FIXME This needs to be changed so tough and killer difficulty can be used later.
+void kf_SetKillerLevel( void )
{
if(!bMultiPlayer || (NetPlay.bComms == 0))
{
setDifficultyLevel(DL_KILLER);
- addConsoleMessage("Hard as nails!!!",LEFT_JUSTIFY);
+ addConsoleMessage("Are you nuts!!!",LEFT_JUSTIFY);
}
}
-// --------------------------------------------------------------------------
-void kf_SetEasyLevel( void )
-{
- if(!bMultiPlayer|| (NetPlay.bComms == 0))
- {
- setDifficultyLevel(DL_EASY);
- addConsoleMessage("Takings thing easy!",LEFT_JUSTIFY);
- }
-}
// --------------------------------------------------------------------------
-void kf_UpThePower( void )
+// show me the power - 1000 extra power
+void kf_UpThePower( void )
{
if(!bMultiPlayer|| (NetPlay.bComms == 0))
{
@@ -253,46 +278,35 @@
}
// --------------------------------------------------------------------------
-void kf_MaxPower( void )
+void kf_ToggleMouseInvert( void )
{
- if(!bMultiPlayer|| (NetPlay.bComms == 0))
+ if(getInvertMouseStatus())
{
- asPower[selectedPlayer]->currentPower=SDWORD_MAX;
- addConsoleMessage("Max Power!!",LEFT_JUSTIFY);
+ setInvertMouseStatus(FALSE);
}
-}
-
-// --------------------------------------------------------------------------
-void kf_SetNormalLevel( void )
-{
- if(!bMultiPlayer|| (NetPlay.bComms == 0))
+ else
{
- setDifficultyLevel(DL_NORMAL);
- addConsoleMessage("Back to normality!",LEFT_JUSTIFY);
+ setInvertMouseStatus(TRUE);
}
}
+
// --------------------------------------------------------------------------
-void kf_SetHardLevel( void )
+void kf_ToggleShakeStatus( void )
{
- if(!bMultiPlayer|| (NetPlay.bComms == 0))
+ if(getShakeStatus())
{
- setDifficultyLevel(DL_HARD);
- addConsoleMessage("Getting tricky!",LEFT_JUSTIFY);
+ setShakeStatus(FALSE);
}
-}
-// --------------------------------------------------------------------------
-void kf_SetToughUnitsLevel( void )
-{
- if(!bMultiPlayer|| (NetPlay.bComms == 0))
+ else
{
- setDifficultyLevel(DL_TOUGH);
- addConsoleMessage("Twice as nice!",LEFT_JUSTIFY);
+ setShakeStatus(TRUE);
}
+
}
+
// --------------------------------------------------------------------------
-
-/* Writes out the frame rate */
-void kf_FrameRate( void )
+// Writes out the frame rate
+void kf_FrameRate( void )
{
if (pie_GetRenderEngine() == ENGINE_GLIDE)
{
@@ -357,7 +371,158 @@
}
// --------------------------------------------------------------------------
+// Makes it snow if it's not snowing and stops it if it is
+void kf_ToggleWeather( void )
+{
+ if(atmosGetWeatherType() == WT_NONE)
+ {
+ atmosSetWeatherType(WT_SNOWING);
+ addConsoleMessage("Oh, the weather outside is frightful... SNOW",LEFT_JUSTIFY);
+ }
+ else if(atmosGetWeatherType() == WT_SNOWING)
+ {
+ atmosSetWeatherType(WT_RAINING);
+ addConsoleMessage("Singing in the rain, I'm singing in the rain... RAIN",LEFT_JUSTIFY);
+ }
+ else
+ {
+ atmosInitSystem();
+ atmosSetWeatherType(WT_NONE);
+ addConsoleMessage("Forecast : Clear skies for all areas... NO WEATHER",LEFT_JUSTIFY);
+ }
+}
+
+// --------------------------------------------------------------------------
+// kill all the selected objects
+void kf_KillSelected(void)
+{
+ DROID *psCDroid, *psNDroid;
+ STRUCTURE *psCStruct, *psNStruct;
+
+#ifndef DEBUG
+if(bMultiPlayer)
+{
+ return;
+}
+#endif
+
+ for(psCDroid=apsDroidLists[selectedPlayer]; psCDroid; psCDroid=psNDroid)
+ {
+ psNDroid = psCDroid->psNext;
+ if (psCDroid->selected)
+ {
+// removeDroid(psCDroid);
+ destroyDroid(psCDroid);
+ }
+ }
+ for(psCStruct=apsStructLists[selectedPlayer]; psCStruct; psCStruct=psNStruct)
+ {
+ psNStruct = psCStruct->psNext;
+ if (psCStruct->selected)
+ {
+ destroyStruct(psCStruct);
+ }
+ }
+}
+
+// --------------------------------------------------------------------------
+// Tell the scripts to start a mission
+void kf_AddMissionOffWorld( void )
+{
+#ifndef DEBUG
+if(bMultiPlayer)
+{
+ return;
+}
+#endif
+ game_SetValidityKey(VALIDITYKEY_CTRL_M);
+ eventFireCallbackTrigger(CALL_MISSION_START);
+}
+
+
+/*
+ *
+ * Debug(ish) Functions
+ *
+ */
+
+// --------------------------------------------------------------------------
+// Toggles the outline around the map tiles FIXME in cheat line 26
+void kf_ToggleOutline( void )
+{
+ if(terrainOutline)
+ {
+ terrainOutline = FALSE;
+ }
+ else
+ {
+ terrainOutline = TRUE;
+ }
+// addConsoleMessage("Tile outline display toggled",DEFAULT_JUSTIFY);
+}
+
+// --------------------------------------------------------------------------
+// Not yet set. May need to be fixed up anyway.
+void kf_ToggleGodMode( void )
+{
+#ifndef DEBUG
+if(bMultiPlayer && (NetPlay.bComms != 0) )
+{
+ return;
+}
+#endif
+ if(godMode)
+ {
+ godMode = FALSE;
+// setDifficultyLevel(getDifficultyLevel());
+ CONPRINTF(ConsoleString,(ConsoleString,"God Mode OFF"));
+ }
+ else
+ {
+ godMode = TRUE;
+// setModifiers(FRACTCONST(1000,100),FRACTCONST(100,1000));
+ CONPRINTF(ConsoleString,(ConsoleString,"God Mode ON"));
+ }
+
+}
+
+// --------------------------------------------------------------------------
+// Writes out debug info about all the selected droids
+void kf_DebugDroidInfo( void )
+{
+DROID *psDroid;
+
+ for(psDroid = apsDroidLists[selectedPlayer]; psDroid; psDroid=psDroid->psNext)
+ {
+ if (psDroid->selected)
+ {
+ printDroidInfo(psDroid);
+ }
+ }
+}
+
+// --------------------------------------------------------------------------
+// Unknown use
+void kf_MaxPower( void )
+{
+ if(!bMultiPlayer|| (NetPlay.bComms == 0))
+ {
+ asPower[selectedPlayer]->currentPower=SDWORD_MAX;
+ addConsoleMessage("Max Power!!",LEFT_JUSTIFY);
+ }
+}
+
+// --------------------------------------------------------------------------
+// Recalculates the lighting values for a tile
+void kf_RecalcLighting( void )
+{
+ //initLighting();
+ initLighting(0, 0, mapWidth, mapHeight);
+ addConsoleMessage("Lighting values for all tiles recalculated",DEFAULT_JUSTIFY);
+}
+
+// --------------------------------------------------------------------------
// display the total number of objects in the world
void kf_ShowNumObjects( void )
{
@@ -392,142 +557,375 @@
}
// --------------------------------------------------------------------------
+// give all - TEST FUNCTION - MAKE EVERYTHING AVAILABLE
+void kf_AllAvailable( void )
+{
-/* Toggles radar on off */
-void kf_ToggleRadar( void )
+#ifndef DEBUG
+if(bMultiPlayer && (NetPlay.bComms != 0) )
{
- radarOnScreen = !radarOnScreen;
-// addConsoleMessage("Radar display toggled",DEFAULT_JUSTIFY);
+ return;
}
+#endif
+
+// addConsoleMessage("All items made available",DEFAULT_JUSTIFY);
+ makeAllAvailable();
+
+}
+
// --------------------------------------------------------------------------
+// show mappings - Dumps all the keyboard mappings to the console display
+void kf_ShowMappings( void )
+{
+ keyShowMappings();
+}
-/* Toggles the outline around the map tiles */
-void kf_ToggleOutline( void )
+// --------------------------------------------------------------------------
+void kf_ToggleDroidInfo( void )
{
- if(terrainOutline)
+ camToggleInfo();
+}
+
+// --------------------------------------------------------------------------
+// Probably doesn't work and may crash game
+void kf_ToggleDrivingMode( void )
+{
+ /* No point unless we're tracking */
+ if(getWarCamStatus())
+ {
+ if(getDrivingStatus())
{
- terrainOutline = FALSE;
+ StopDriverMode();
}
else
{
- terrainOutline = TRUE;
+ if( (driveModeActive() == FALSE) && !bMultiPlayer)
+ {
+ StartDriverMode( NULL );
+ }
}
-// addConsoleMessage("Tile outline display toggled",DEFAULT_JUSTIFY);
+ }
+
}
// --------------------------------------------------------------------------
+void kf_GiveTemplateSet(void)
+{
+ addTemplateSet(4,0);
+ addTemplateSet(4,1);
+ addTemplateSet(4,2);
+ addTemplateSet(4,3);
+}
-/* Toggles infinite power on/off */
-void kf_TogglePower( void )
+// --------------------------------------------------------------------------
+// Not written
+void kf_ScatterDroids( void )
{
+ // to be written!
+ addConsoleMessage("Scatter droids - not written yet!",LEFT_JUSTIFY);
+}
+
+// --------------------------------------------------------------------------
+// Toggles whether we process debug key mappings
+void kf_ToggleDebugMappings( void )
+{
#ifndef DEBUG
-if(bMultiPlayer)
+if(bMultiPlayer && (NetPlay.bComms != 0) )
{
return;
}
#endif
- powerCalculated = !powerCalculated;
- if (powerCalculated)
+
+#ifndef DEBUG
+ if(bAllowDebugMode)
+#endif
+ {
+ if(getDebugMappingStatus())
{
- addConsoleMessage("Infinite power disabled",DEFAULT_JUSTIFY);
- powerCalc(TRUE);
+ processDebugMappings(FALSE);
+ CONPRINTF(ConsoleString,(ConsoleString,"ALL Debug Key Mappings - DISALLOWED"));
}
else
{
- addConsoleMessage("Infinite power enabled",DEFAULT_JUSTIFY);
+ game_SetValidityKey(VALIDITYKEY_CHEAT_MODE);
+ processDebugMappings(TRUE);
+ CONPRINTF(ConsoleString,(ConsoleString,"ALL Debug Key Mappings - PERMITTED"));
+ CONPRINTF(ConsoleString,(ConsoleString,"DISCLAIMER: YOU HAVE NOW CHEATED"));
}
+ if(bMultiPlayer)
+ {
+ sendTextMessage("Presses Debug. CHEAT",TRUE);
+ }
+ }
}
// --------------------------------------------------------------------------
+// Halves all the heights of the map tiles
+void kf_HalveHeights( void )
+{
+UDWORD i,j;
+MAPTILE *psTile;
-/* Recalculates the lighting values for a tile */
-void kf_RecalcLighting( void )
-{
- //initLighting();
- initLighting(0, 0, mapWidth, mapHeight);
- addConsoleMessage("Lighting values for all tiles recalculated",DEFAULT_JUSTIFY);
+ for (i=0; i<mapWidth; i++)
+ {
+ for (j=0; j<mapHeight; j++)
+ {
+ psTile = mapTile(i,j);
+ psTile->height/=2;;
+ }
+ }
}
// --------------------------------------------------------------------------
-
-/* Raises the 3dfx gamma value */
-void kf_RaiseGamma( void )
+// Unknown function - keymap value of LCtrl K
+void kf_ToggleMistFog( void )
{
- if (pie_GetRenderEngine() == ENGINE_GLIDE)
- {
- if(gamma<(float)5.0)
+ static BOOL bEnabled = TRUE;//start in nicks mode
+
+ if (bEnabled)//true, so go to false
{
- gamma = gamma+(float)0.1;
- pie_SetGammaValue(gamma);
- addConsoleMessage("Gamma correction altered",DEFAULT_JUSTIFY);
+ bEnabled = FALSE;
+ fogStatus &= FOG_FLAGS-FOG_GROUND;//clear highest bit of 3
+ if (fogStatus == 0)
+ {
+ pie_SetFogStatus(FALSE);
+ pie_EnableFog(FALSE);
+ }
}
else
{
- gamma = (float)0.2;
+ bEnabled = TRUE;
+ if (fogStatus == 0)
+ {
+ pie_EnableFog(TRUE);
+ }
+ fogStatus |= FOG_GROUND;//set highest bit of 3
}
+}
+
+// --------------------------------------------------------------------------
+// Fog Color, haze black urban or rockies. keymap: LCtrl L
+void kf_ToggleFogColour( void )
+{
+ fogCol++;
+ if (fogCol>4)
+ fogCol = 0;
+ switch(fogCol)
+ {
+ case 1:
+ pie_SetFogColour(0x00c9920f);//nicks colour Urban
+ break;
+ case 2:
+ pie_SetFogColour(0x00b6e1ec);//nicks colour Rockies 182,225,236
+ break;
+ case 3:
+ pie_SetFogColour(0x00101040);//haze
+ break;
+ case 4:
+ pie_SetFogColour(0x00000000);//black
+ break;
+ case 0:
+ default:
+ pie_SetFogColour(0x00B08f5f);//nicks colour Arizona
+ //pie_SetFogColour(0x0078684f);//(nicks colour + 404040)/2
+ break;
}
}
// --------------------------------------------------------------------------
-
-/* Lowers the threedfx gamma value */
-void kf_LowerGamma( void )
+// Fog on or off - keymap: LCtrl J
+void kf_ToggleFog( void )
{
- if (pie_GetRenderEngine() == ENGINE_GLIDE)
- {
- if(gamma>(float)0.2)
+ static BOOL fogEnabled = FALSE;
+
+ if (fogEnabled)
{
- gamma = gamma-(float)0.1;
- pie_SetGammaValue(gamma);
- addConsoleMessage("Gamma correction lowered",DEFAULT_JUSTIFY);
+ fogEnabled = FALSE;
+ pie_SetFogStatus(FALSE);
+ pie_EnableFog(fogEnabled);
+// addConsoleMessage("Fog Off",DEFAULT_JUSTIFY);
}
else
{
- addConsoleMessage("Gamma correction at MINIMUM",DEFAULT_JUSTIFY);
+ fogEnabled = TRUE;
+ pie_EnableFog(fogEnabled);
+// addConsoleMessage("Fog On",DEFAULT_JUSTIFY);
}
+}
+
+// --------------------------------------------------------------------------
+// Quick game exit - keymap keypad -
+void kf_SystemClose( void )
+{
+ if(pie_GetRenderEngine() == ENGINE_GLIDE)
+ {
+ grSstControl(GR_CONTROL_DEACTIVATE);
}
-}
+// ExitProcess(4);
+ loopFastExit();
+}
+
// --------------------------------------------------------------------------
+// Maximum Scroll Limits - set in debug and also commented out 395/436 keymap J
+void kf_MaxScrollLimits( void )
+{
+ scrollMinX = scrollMinY = 0;
+ scrollMaxX = mapWidth;
+ scrollMaxY = mapHeight;
+}
-/* Sends the 3dfx screen buffer to disk */
-void kf_ScreenDump( void )
+// --------------------------------------------------------------------------
+// If this is performed twice then it changes the productionPlayer
+void kf_SelectPlayer( void )
{
- if(pie_GetRenderEngine() == ENGINE_GLIDE)
+ UDWORD playerNumber, prevPlayer;
+#ifndef DEBUG
+if(bMultiPlayer && (NetPlay.bComms != 0) )
+{
+ return;
+}
+#endif
+ //store the current player
+ prevPlayer = selectedPlayer;
+
+ playerNumber = (getLastSubKey()-KEY_F1);
+ if(playerNumber >= 10)
{
- CONPRINTF(ConsoleString,(ConsoleString,"3dfx 24 bit raw screen dump written to working directory : %s",iV_ScreenDumpToDisk()));
+ selectedPlayer = 0;
}
else
{
- CONPRINTF(ConsoleString,(ConsoleString,"Screen dump function presently only works on 3dfx based cards."));
+ selectedPlayer = playerNumber;
}
+ // godMode = TRUE;
+
+ if (prevPlayer == selectedPlayer)
+ {
+ changeProductionPlayer((UBYTE)selectedPlayer);
+ }
+
}
// --------------------------------------------------------------------------
+// Tell the scripts to end a mission
+void kf_EndMissionOffWorld( void )
+{
+#ifndef DEBUG
+if(bMultiPlayer)
+{
+ return;
+}
+#endif
+ eventFireCallbackTrigger(CALL_MISSION_END);
+}
-/* Make all functions available */
-void kf_AllAvailable( void )
+// --------------------------------------------------------------------------
+// Initialise the player power levels
+void kf_NewPlayerPower( void )
{
-
#ifndef DEBUG
-if(bMultiPlayer && (NetPlay.bComms != 0) )
+if(bMultiPlayer)
{
return;
}
#endif
+ newGameInitPower();
+}
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h Toggles the power bar display on and off
+void kf_TogglePowerBar( void )
+{
+ togglePowerBar();
+}
-// addConsoleMessage("All items made available",DEFAULT_JUSTIFY);
- makeAllAvailable();
+// --------------------------------------------------------------------------
+// Pause the game
+void kf_TogglePauseMode( void )
+{
+ if(bMultiPlayer && (NetPlay.bComms != 0) )
+ {
+ return;
+ }
+ /* Is the game running? */
+ if(gamePaused() == FALSE)
+ {
+ /* Then pause it */
+ setGamePauseStatus(TRUE);
+ setConsolePause(TRUE);
+ setScriptPause(TRUE);
+ setAudioPause(TRUE);
+ /* And stop the clock */
+ gameTimeStop();
+ addConsoleMessage(strresGetString(psStringRes,STR_MISC_PAUSED),CENTRE_JUSTIFY);
+
+ }
+ else
+ {
+ /* Else get it going again */
+ setGamePauseStatus(FALSE);
+ setConsolePause(FALSE);
+ setScriptPause(FALSE);
+ setAudioPause(FALSE);
+ /* And start the clock again */
+ gameTimeStart();
+ }
}
// --------------------------------------------------------------------------
+void kf_ChooseOptions( void )
+{
+// if(!widgetsOn) widgetsOn = TRUE;
+ intResetScreen(TRUE);
+ setWidgetsStatus(TRUE);
+ intAddOptions();
+}
-/* Flips the cut of a tile */
-void kf_TriFlip( void )
+// --------------------------------------------------------------------------
+void kf_ToggleVisibility( void )
{
+ if(getRevealStatus())
+ {
+ setRevealStatus(FALSE);
+ }
+ else
+ {
+ setRevealStatus(TRUE);
+ }
+
+}
+
+
+/*
+ *
+ * Unknown Functions
+ *
+ */
+
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h Toggles whether the windows surface gets updated
+void kf_UpdateWindow( void )
+{
+ updateVideoCard = !updateVideoCard;
+ addConsoleMessage("Windows surface update toggled",DEFAULT_JUSTIFY);
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h
+void kf_ToggleDimension( void )
+{
+ display3D = FALSE;
+ intSetMapPos(player.p.x + ((visibleXTiles/2) << TILE_SHIFT),
+ player.p.z + ((visibleYTiles/2) << TILE_SHIFT));
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 440. Flips the cut of a tile.
+void kf_TriFlip( void )
+{
iVector pos;
//MAPTILE *psTile;
// psTile = mapTile(mouseTileX,mouseTileY);
@@ -544,7 +942,8 @@
}
// --------------------------------------------------------------------------
-void kf_ToggleBackgroundFog( void )
+// FIXME - Commented out in keymap line 454
+void kf_ToggleBackgroundFog( void )
{
static BOOL bEnabled = TRUE;//start in nicks mode
@@ -569,7 +968,9 @@
}
}
-extern void kf_ToggleDistanceFog( void )
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h
+void kf_ToggleDistanceFog( void )
{
static BOOL bEnabled = TRUE;//start in nicks mode
@@ -594,167 +995,435 @@
}
}
-void kf_ToggleMistFog( void )
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 442
+void kf_ToggleWidgets( void )
{
- static BOOL bEnabled = TRUE;//start in nicks mode
-
- if (bEnabled)//true, so go to false
+// widgetsOn = !widgetsOn;
+ if(getWidgetsStatus())
+ {
+ setWidgetsStatus(FALSE);
+ }
+ else
+ {
+ setWidgetsStatus(TRUE);
+ }
+// addConsoleMessage("Widgets display toggled",DEFAULT_JUSTIFY);
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 441 Toggles on/off gouraud shading
+void kf_ToggleGouraud( void )
+{
+ gouraudShading = !gouraudShading;
+ addConsoleMessage("Gouraud shading toggled",DEFAULT_JUSTIFY);
+ texPage++;
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 437 Simulates a close down
+/*
+void kf_SimCloseDown( void )
+{
+ bScreenClose = TRUE;
+ audio_PlayTrack( ID_SOUND_THX_SHUTDOWN );
+
+ closingTimeStart = gameTime;
+// widgetsOn = FALSE;
+ spinScene = TRUE;
+ radarOnScreen = FALSE;
+ screenCloseState = SC_CLOSING_DOWN;
+}
+*/
+
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h - Shrink the screen down
+/*
+void kf_ShrinkScreen( void )
+{
+ // nearest multiple of 8 plus 1
+ if (xOffset<73)
+ {
+ xOffset+=8;
+ distance+=170;
+ if (yOffset<200)
{
- bEnabled = FALSE;
- fogStatus &= FOG_FLAGS-FOG_GROUND;//clear highest bit of 3
- if (fogStatus == 0)
- {
- pie_SetFogStatus(FALSE);
- pie_EnableFog(FALSE);
- }
+ yOffset+=8;
}
- else
- {
- bEnabled = TRUE;
- if (fogStatus == 0)
- {
- pie_EnableFog(TRUE);
- }
- fogStatus |= FOG_GROUND;//set highest bit of 3
- }
+ }
}
+*/
-void kf_ToggleFogColour( void )
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h - Expand the screen
+/*
+void kf_ExpandScreen( void )
{
- fogCol++;
- if (fogCol>4)
- fogCol = 0;
- switch(fogCol)
+ if(xOffset)
{
- case 1:
- pie_SetFogColour(0x00c9920f);//nicks colour Urban
- break;
- case 2:
- pie_SetFogColour(0x00b6e1ec);//nicks colour Rockies 182,225,236
- break;
- case 3:
- pie_SetFogColour(0x00101040);//haze
- break;
- case 4:
- pie_SetFogColour(0x00000000);//black
- break;
- case 0:
- default:
- pie_SetFogColour(0x00B08f5f);//nicks colour Arizona
- //pie_SetFogColour(0x0078684f);//(nicks colour + 404040)/2
- break;
+ if (distance>DISTANCE)
+ {
+ distance-=170;
+ }
+ xOffset-=8;
+ if(yOffset)
+ {
+ yOffset-=8;
+ }
}
}
+*/
-void kf_ToggleFog( void )
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 450 Raises the tile under the mouse
+void kf_RaiseTile( void )
{
- static BOOL fogEnabled = FALSE;
-
- if (fogEnabled)
+ raiseTile(mouseTileX,mouseTileY);
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 456, also in debug section line 400 Lowers the tile under the mouse
+void kf_LowerTile( void )
+{
+// lowerTile(mouseTileX,mouseTileY);
+ selNextSpecifiedBuilding(REF_FACTORY);
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h
+void kf_SelectMoveGrouping( void )
+{
+UDWORD groupNumber;
+
+ groupNumber = (getLastSubKey()-KEY_1) + 1;
+ activateGroupAndMove(selectedPlayer,groupNumber);
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 431 Raises the G Offset
+void kf_UpGeoOffset( void )
+{
+ geoOffset++;
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 432 Lowers the geoOffset
+void kf_DownGeoOffset( void )
+{
+ geoOffset--;
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 433 Ups the droid scale
+void kf_UpDroidScale( void )
+{
+ droidScale++;
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 434 Lowers the droid scale
+void kf_DownDroidScale( void )
+{
+ if(droidScale>2)
+ {
+ droidScale--;
+ }
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h
+void kf_TriggerRayCast( void )
+{
+DROID *psDroid;
+BOOL found;
+DROID *psOther;
+
+ found = FALSE;
+ for(psDroid = apsDroidLists[selectedPlayer]; psDroid AND !found;
+ psDroid = psDroid->psNext)
{
- fogEnabled = FALSE;
- pie_SetFogStatus(FALSE);
- pie_EnableFog(fogEnabled);
-// addConsoleMessage("Fog Off",DEFAULT_JUSTIFY);
+ if(psDroid->selected)
+ {
+ found = TRUE;
+ psOther = psDroid;
+ }
+ /* NOP */
}
- else
- {
- fogEnabled = TRUE;
- pie_EnableFog(fogEnabled);
-// addConsoleMessage("Fog On",DEFAULT_JUSTIFY);
- }
+
+ if(found)
+ {
+// getBlockHeightDirToEdgeOfGrid(UDWORD x, UDWORD y, UBYTE direction, UDWORD *height, UDWORD *dist)
+ // getBlockHeightDirToEdgeOfGrid(psOther->x,psOther->y,psOther->direction,&height,&dist);
+// getBlockHeightDirToEdgeOfGrid(mouseTileX*TILE_UNITS,mouseTileY*TILE_UNITS,getTestAngle(),&height,&dist);
+ }
}
// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h
+void kf_ScriptTest( void )
+{
+ UBYTE *pBuffer;
+ UDWORD size;
-/* Toggles fog on/off */
-void kf_ToggleWidgets( void )
+ eventSaveState(1,&pBuffer, &size);
+
+ eventReset();
+
+ eventLoadState(pBuffer, size, TRUE);
+
+ FREE(pBuffer);
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c/h
+void kf_TriggerShockWave( void )
{
-// widgetsOn = !widgetsOn;
- if(getWidgetsStatus())
+iVector pos;
+
+ pos.x = mouseTileX*TILE_UNITS + TILE_UNITS/2;
+ pos.z = mouseTileY*TILE_UNITS + TILE_UNITS/2;
+ pos.y = map_Height(pos.x,pos.z) + SHOCK_WAVE_HEIGHT;
+
+ addEffect(&pos,EFFECT_EXPLOSION,EXPLOSION_TYPE_SHOCKWAVE,FALSE,NULL,0);
+}
+
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 443
+//void kf_ToggleRadarAllign( void )
+//{
+// toggleRadarAllignment();
+// addConsoleMessage("Radar allignment toggled",LEFT_JUSTIFY);
+//}
+
+// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c ?? not in h
+void kf_ToggleBlips( void )
+{
+ if(doWeDrawRadarBlips())
{
- setWidgetsStatus(FALSE);
+ setBlipDraw(FALSE);
}
else
{
- setWidgetsStatus(TRUE);
+ setBlipDraw(TRUE);
}
-// addConsoleMessage("Widgets display toggled",DEFAULT_JUSTIFY);
}
// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c ?? not in h
+void kf_ToggleProximitys( void )
+{
+ if(doWeDrawProximitys())
+ {
+ setProximityDraw(FALSE);
+ }
+ else
+ {
+ setProximityDraw(TRUE);
+ }
+}
-/* Toggle camera on/off */
-void kf_ToggleCamera( void )
+// --------------------------------------------------------------------------
+// FIXME - Commented out in keymap line 458 display the grid info for all the selected objects
+void kf_ShowGridInfo(void)
{
- if(getWarCamStatus() == FALSE) {
- shakeStop(); // Ensure screen shake stopped before starting camera mode.
- setDrivingStatus(FALSE);
+ DROID *psCDroid, *psNDroid;
+ STRUCTURE *psCStruct, *psNStruct;
+
+ for(psCDroid=apsDroidLists[selectedPlayer]; psCDroid; psCDroid=psNDroid)
+ {
+ psNDroid = psCDroid->psNext;
+ if (psCDroid->selected)
+ {
+ gridDisplayCoverage((BASE_OBJECT *)psCDroid);
}
- camToggleStatus();
+ }
+ for(psCStruct=apsStructLists[selectedPlayer]; psCStruct; psCStruct=psNStruct)
+ {
+ psNStruct = psCStruct->psNext;
+ if (psCStruct->selected)
+ {
+ gridDisplayCoverage((BASE_OBJECT *)psCStruct);
+ }
+ }
}
// --------------------------------------------------------------------------
+// FIXME - Only listed in keybind.c usage removed?
+void kfsf_SelectAllSameProp( PROPULSION_TYPE propType )
+{
+ UNUSEDPARAMETER(propType);
+ /*
+PROPULSION_STATS *psPropStats;
+DROID *psDroid;
-/* Simulates a close down */
+ for(psDroid = apsDroidLists[selectedPlayer]; psDroid; psDroid = psDroid->psNext)
+ {
+ if(!psDroid->selected)
+ {
+ psPropStats = asPropulsionStats + psDroid->asBits[COMP_PROPULSION].nStat;
+ ASSERT( (PTRVALID(psPropStats, sizeof(PROPULSION_STATS)),
+ "moveUpdateDroid: invalid propulsion stats pointer") );
+ if ( psPropStats->propulsionType == propType )
+ {
+ psDroid->selected = TRUE;
+ }
+ }
+ }
+ */
+}
+
+
/*
-void kf_SimCloseDown( void )
+ *
+ * 3dFx Functions
+ *
+ */
+
+// --------------------------------------------------------------------------
+/* Raises the 3dfx gamma value */
+void kf_RaiseGamma( void )
{
- bScreenClose = TRUE;
- audio_PlayTrack( ID_SOUND_THX_SHUTDOWN );
+ if (pie_GetRenderEngine() == ENGINE_GLIDE)
+ {
+ if(gamma<(float)5.0)
+ {
+ gamma = gamma+(float)0.1;
+ pie_SetGammaValue(gamma);
+ addConsoleMessage("Gamma correction altered",DEFAULT_JUSTIFY);
+ }
+ else
+ {
+ gamma = (float)0.2;
+ }
+ }
+}
- closingTimeStart = gameTime;
-// widgetsOn = FALSE;
- spinScene = TRUE;
- radarOnScreen = FALSE;
- screenCloseState = SC_CLOSING_DOWN;
-}
-*/
// --------------------------------------------------------------------------
+/* Lowers the threedfx gamma value */
+void kf_LowerGamma( void )
+{
+ if (pie_GetRenderEngine() == ENGINE_GLIDE)
+ {
+ if(gamma>(float)0.2)
+ {
+ gamma = gamma-(float)0.1;
+ pie_SetGammaValue(gamma);
+ addConsoleMessage("Gamma correction lowered",DEFAULT_JUSTIFY);
+ }
+ else
+ {
+ addConsoleMessage("Gamma correction at MINIMUM",DEFAULT_JUSTIFY);
+ }
+ }
+}
-/* Toggles on/off gouraud shading */
-void kf_ToggleGouraud( void )
+// --------------------------------------------------------------------------
+/* Sends the 3dfx screen buffer to disk */
+void kf_ScreenDump( void )
{
- gouraudShading = !gouraudShading;
- addConsoleMessage("Gouraud shading toggled",DEFAULT_JUSTIFY);
- texPage++;
+ if(pie_GetRenderEngine() == ENGINE_GLIDE)
+ {
+ CONPRINTF(ConsoleString,(ConsoleString,"3dfx 24 bit raw screen dump written to working directory : %s",iV_ScreenDumpToDisk()));
+ }
+ else
+ {
+ CONPRINTF(ConsoleString,(ConsoleString,"Screen dump function presently only works on 3dfx based cards."));
+ }
}
+
+/*
+ *
+ * KeyMap Functions
+ *
+ */
+
// --------------------------------------------------------------------------
+void kf_ToggleRadarJump( void )
+{
+ if(getRadarJumpStatus())
+ {
+ setRadarJump(FALSE);
+ }
+ else
+ {
+ setRadarJump(TRUE);
+ }
+}
-/* Raises the tile under the mouse */
-void kf_RaiseTile( void )
+// --------------------------------------------------------------------------
+void kf_FaceNorth(void)
{
- raiseTile(mouseTileX,mouseTileY);
+ player.r.y = 0;
+ if(getWarCamStatus())
+ {
+ camToggleStatus();
+ }
}
// --------------------------------------------------------------------------
+void kf_FaceSouth(void)
+{
+ player.r.y = DEG(180);
+ if(getWarCamStatus())
+ {
+ camToggleStatus();
+ }
+}
-/* Lowers the tile under the mouse */
-void kf_LowerTile( void )
+// --------------------------------------------------------------------------
+void kf_FaceEast(void)
{
-// lowerTile(mouseTileX,mouseTileY);
- selNextSpecifiedBuilding(REF_FACTORY);
+ player.r.y = DEG(90);
+ if(getWarCamStatus())
+ {
+ camToggleStatus();
+ }
}
// --------------------------------------------------------------------------
+void kf_FaceWest(void)
+{
+ player.r.y = DEG(270);
+ if(getWarCamStatus())
+ {
+ camToggleStatus();
+ }
+}
-/* Quick game exit */
-void kf_SystemClose( void )
+// --------------------------------------------------------------------------
+void kf_ToggleConsoleDrop( void )
{
- if(pie_GetRenderEngine() == ENGINE_GLIDE)
+ if(!bInTutorial)
{
- grSstControl(GR_CONTROL_DEACTIVATE);
+ toggleConsoleDrop();
}
+}
-// ExitProcess(4);
- loopFastExit();
+// --------------------------------------------------------------------------
+// Toggles radar on off
+void kf_ToggleRadar( void )
+{
+ radarOnScreen = !radarOnScreen;
+// addConsoleMessage("Radar display toggled",DEFAULT_JUSTIFY);
}
// --------------------------------------------------------------------------
-/* Zooms out from display */
-void kf_ZoomOut( void )
+// Toggle camera on/off
+void kf_ToggleCamera( void )
{
+ if(getWarCamStatus() == FALSE) {
+ shakeStop(); // Ensure screen shake stopped before starting camera mode.
+ setDrivingStatus(FALSE);
+ }
+ camToggleStatus();
+}
+
+// --------------------------------------------------------------------------
+// Zooms out from display
+void kf_ZoomOut( void )
+{
FRACT fraction;
FRACT zoomInterval;
@@ -776,8 +1445,26 @@
}
// --------------------------------------------------------------------------
-void kf_RadarZoomIn( void )
+// Zooms in the map
+void kf_ZoomIn( void )
{
+FRACT fraction;
+FRACT zoomInterval;
+
+ fraction = MAKEFRACT(frameTime2)/GAME_TICKS_PER_SEC;
+ zoomInterval = fraction * MAP_ZOOM_RATE;
+ distance -= MAKEINT(zoomInterval);
+
+ if( distance< MINDISTANCE)
+ {
+ distance = MINDISTANCE;
+ }
+
+}
+
+// --------------------------------------------------------------------------
+void kf_RadarZoomIn( void )
+{
if(RadarZoomLevel < MAX_RADARZOOM)
{
RadarZoomLevel++;
@@ -790,8 +1477,9 @@
}
}
+
// --------------------------------------------------------------------------
-void kf_RadarZoomOut( void )
+void kf_RadarZoomOut( void )
{
if(RadarZoomLevel)
{
@@ -804,74 +1492,11 @@
audio_PlayTrack( ID_SOUND_BUILD_FAIL );
}
}
-// --------------------------------------------------------------------------
-// --------------------------------------------------------------------------
-/* Zooms in the map */
-void kf_ZoomIn( void )
-{
-FRACT fraction;
-FRACT zoomInterval;
- fraction = MAKEFRACT(frameTime2)/GAME_TICKS_PER_SEC;
- zoomInterval = fraction * MAP_ZOOM_RATE;
- distance -= MAKEINT(zoomInterval);
-
- if( distance< MINDISTANCE)
- {
- distance = MINDISTANCE;
- }
-
-}
-
// --------------------------------------------------------------------------
-void kf_MaxScrollLimits( void )
+// Spins the world round left
+void kf_RotateLeft( void )
{
- scrollMinX = scrollMinY = 0;
- scrollMaxX = mapWidth;
- scrollMaxY = mapHeight;
-}
-
-
-// --------------------------------------------------------------------------
-// Shrink the screen down
-/*
-void kf_ShrinkScreen( void )
-{
- // nearest multiple of 8 plus 1
- if (xOffset<73)
- {
- xOffset+=8;
- distance+=170;
- if (yOffset<200)
- {
- yOffset+=8;
- }
- }
-}
-*/
-// --------------------------------------------------------------------------
-// Expand the screen
-/*
-void kf_ExpandScreen( void )
-{
- if(xOffset)
- {
- if (distance>DISTANCE)
- {
- distance-=170;
- }
- xOffset-=8;
- if(yOffset)
- {
- yOffset-=8;
- }
- }
-}
-*/
-// --------------------------------------------------------------------------
-/* Spins the world round left */
-void kf_RotateLeft( void )
-{
FRACT fraction;
FRACT rotAmount;
@@ -881,8 +1506,8 @@
}
// --------------------------------------------------------------------------
-/* Spins the world right */
-void kf_RotateRight( void )
+// Spins the world right
+void kf_RotateRight( void )
{
FRACT fraction;
FRACT rotAmount;
@@ -897,8 +1522,8 @@
}
// --------------------------------------------------------------------------
-/* Pitches camera back */
-void kf_PitchBack( void )
+// Pitches camera back
+void kf_PitchBack( void )
{
FRACT fraction;
FRACT pitchAmount;
@@ -938,8 +1563,8 @@
}
// --------------------------------------------------------------------------
-/* Pitches camera foward */
-void kf_PitchForward( void )
+// Pitches camera foward
+void kf_PitchForward( void )
{
FRACT fraction;
FRACT pitchAmount;
@@ -960,56 +1585,17 @@
}
// --------------------------------------------------------------------------
-/* Resets pitch to default */
-void kf_ResetPitch( void )
+// Resets pitch to default
+void kf_ResetPitch( void )
{
player.r.x = DEG(360-20);
distance = START_DISTANCE;
}
// --------------------------------------------------------------------------
-/* Dumps all the keyboard mappings to the console display */
-void kf_ShowMappings( void )
+// Selects the player's groups 1..9
+void kf_SelectGrouping( void )
{
- keyShowMappings();
-}
-
-// --------------------------------------------------------------------------
-/*If this is performed twice then it changes the productionPlayer*/
-void kf_SelectPlayer( void )
-{
- UDWORD playerNumber, prevPlayer;
-#ifndef DEBUG
-if(bMultiPlayer && (NetPlay.bComms != 0) )
-{
- return;
-}
-#endif
- //store the current player
- prevPlayer = selectedPlayer;
-
- playerNumber = (getLastSubKey()-KEY_F1);
- if(playerNumber >= 10)
- {
- selectedPlayer = 0;
- }
- else
- {
- selectedPlayer = playerNumber;
- }
- // godMode = TRUE;
-
- if (prevPlayer == selectedPlayer)
- {
- changeProductionPlayer((UBYTE)selectedPlayer);
- }
-
-}
-// --------------------------------------------------------------------------
-
-/* Selects the player's groups 1..9 */
-void kf_SelectGrouping( void )
-{
UDWORD groupNumber;
BOOL bAlreadySelected;
DROID *psDroid;
@@ -1053,10 +1639,8 @@
}
}
-
// --------------------------------------------------------------------------
-
-void kf_AssignGrouping( void )
+void kf_AssignGrouping( void )
{
UDWORD groupNumber;
@@ -1065,8 +1649,7 @@
}
// --------------------------------------------------------------------------
-
-void kf_SelectCommander( void )
+void kf_SelectCommander( void )
{
SDWORD cmdNumber;
@@ -1076,67 +1659,16 @@
selCommander(cmdNumber);
}
-
// --------------------------------------------------------------------------
-void kf_SelectMoveGrouping( void )
+void kf_addInGameOptions( void )
{
-UDWORD groupNumber;
-
- groupNumber = (getLastSubKey()-KEY_1) + 1;
- activateGroupAndMove(selectedPlayer,groupNumber);
-}
-// --------------------------------------------------------------------------
-void kf_ToggleDroidInfo( void )
-{
- camToggleInfo();
-}
-// --------------------------------------------------------------------------
-void kf_addInGameOptions( void )
-{
setWidgetsStatus(TRUE);
intAddInGameOptions();
}
-// --------------------------------------------------------------------------
-/* Tell the scripts to start a mission*/
-void kf_AddMissionOffWorld( void )
-{
-#ifndef DEBUG
-if(bMultiPlayer)
-{
- return;
-}
-#endif
- game_SetValidityKey(VALIDITYKEY_CTRL_M);
- eventFireCallbackTrigger(CALL_MISSION_START);
-}
-// --------------------------------------------------------------------------
-/* Tell the scripts to end a mission*/
-void kf_EndMissionOffWorld( void )
-{
-#ifndef DEBUG
-if(bMultiPlayer)
-{
- return;
-}
-#endif
- eventFireCallbackTrigger(CALL_MISSION_END);
-}
-// --------------------------------------------------------------------------
-/* Initialise the player power levels*/
-void kf_NewPlayerPower( void )
-{
-#ifndef DEBUG
-if(bMultiPlayer)
-{
- return;
-}
-#endif
- newGameInitPower();
-}
// --------------------------------------------------------------------------
// Display multiplayer guff.
-void kf_addMultiMenu(void)
+void kf_addMultiMenu(void)
{
if(bMultiPlayer)
{
@@ -1157,6 +1689,8 @@
return;
}
+// --------------------------------------------------------------------------
+// start/stop capturing audio for multiplayer
void kf_multiAudioStop(void)
{
if(bMultiPlayer
@@ -1166,9 +1700,10 @@
}
return;
}
+
// --------------------------------------------------------------------------
-
-void kf_JumpToMapMarker( void )
+// FIXME No idea... Doesn't fall into any of the above listings
+void kf_JumpToMapMarker( void )
{
UDWORD entry;
if(!getRadarTrackingStatus())
@@ -1186,102 +1721,10 @@
}
}
-
// --------------------------------------------------------------------------
-/* Raises the G Offset */
-void kf_UpGeoOffset( void )
+// Aligns the view to north - some people can't handle the world spinning
+void kf_SeekNorth( void )
{
- geoOffset++;
-}
-// --------------------------------------------------------------------------
-/* Lowers the geoOffset */
-void kf_DownGeoOffset( void )
-{
- geoOffset--;
-}
-// --------------------------------------------------------------------------
-/* Ups the droid scale */
-void kf_UpDroidScale( void )
-{
- droidScale++;
-}
-// --------------------------------------------------------------------------
-/* Lowers the droid scale */
-void kf_DownDroidScale( void )
-{
- if(droidScale>2)
- {
- droidScale--;
- }
-}
-// --------------------------------------------------------------------------
-/* Toggles the power bar display on and off*/
-void kf_TogglePowerBar( void )
-{
- togglePowerBar();
-}
-// --------------------------------------------------------------------------
-/* Toggles whether we process debug key mappings */
-void kf_ToggleDebugMappings( void )
-{
-#ifndef DEBUG
-if(bMultiPlayer && (NetPlay.bComms != 0) )
-{
- return;
-}
-#endif
-
-#ifndef DEBUG
- if(bAllowDebugMode)
-#endif
- {
- if(getDebugMappingStatus())
- {
- processDebugMappings(FALSE);
- CONPRINTF(ConsoleString,(ConsoleString,"ALL Debug Key Mappings - DISALLOWED"));
- }
- else
- {
- game_SetValidityKey(VALIDITYKEY_CHEAT_MODE);
- processDebugMappings(TRUE);
- CONPRINTF(ConsoleString,(ConsoleString,"ALL Debug Key Mappings - PERMITTED"));
- CONPRINTF(ConsoleString,(ConsoleString,"DISCLAIMER: YOU HAVE NOW CHEATED"));
- }
- if(bMultiPlayer)
- {
- sendTextMessage("Presses Debug. CHEAT",TRUE);
- }
- }
-}
-// --------------------------------------------------------------------------
-
-
-void kf_ToggleGodMode( void )
-{
-#ifndef DEBUG
-if(bMultiPlayer && (NetPlay.bComms != 0) )
-{
- return;
-}
-#endif
- if(godMode)
- {
- godMode = FALSE;
-// setDifficultyLevel(getDifficultyLevel());
- CONPRINTF(ConsoleString,(ConsoleString,"God Mode OFF"));
- }
- else
- {
- godMode = TRUE;
-// setModifiers(FRACTCONST(1000,100),FRACTCONST(100,1000));
- CONPRINTF(ConsoleString,(ConsoleString,"God Mode ON"));
- }
-
-}
-// --------------------------------------------------------------------------
-/* Aligns the view to north - some people can't handle the world spinning */
-void kf_SeekNorth( void )
-{
player.r.y = 0;
if(getWarCamStatus())
{
@@ -1291,113 +1734,22 @@
}
// --------------------------------------------------------------------------
-void kf_TogglePauseMode( void )
+void kf_ToggleEnergyBars( void )
{
-
- if(bMultiPlayer && (NetPlay.bComms != 0) )
- {
- return;
- }
- /* Is the game running? */
- if(gamePaused() == FALSE)
- {
- /* Then pause it */
- setGamePauseStatus(TRUE);
- setConsolePause(TRUE);
- setScriptPause(TRUE);
- setAudioPause(TRUE);
- /* And stop the clock */
- gameTimeStop();
- addConsoleMessage(strresGetString(psStringRes,STR_MISC_PAUSED),CENTRE_JUSTIFY);
-
- }
- else
- {
- /* Else get it going again */
- setGamePauseStatus(FALSE);
- setConsolePause(FALSE);
- setScriptPause(FALSE);
- setAudioPause(FALSE);
- /* And start the clock again */
- gameTimeStart();
- }
-}
-
-// --------------------------------------------------------------------------
-// finish all the research for the selected player
-void kf_FinishResearch( void )
-{
- STRUCTURE *psCurr;
-
- //for (psCurr=apsStructLists[selectedPlayer]; psCurr; psCurr = psCurr->psNext)
- for (psCurr=interfaceStructList(); psCurr; psCurr = psCurr->psNext)
- {
- if (psCurr->pStructureType->type == REF_RESEARCH)
- {
- //((RESEARCH_FACILITY *)psCurr->pFunctionality)->timeStarted = 0;
- ((RESEARCH_FACILITY *)psCurr->pFunctionality)->timeStarted = gameTime + 100000;
- //set power accrued to high value so that will trigger straight away
- ((RESEARCH_FACILITY *)psCurr->p...
[truncated message content] |
|
From: <phe...@us...> - 2012-11-16 21:11:28
|
Revision: 41
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=41&view=rev
Author: pheonixstorm
Date: 2012-11-16 21:11:22 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
Misspelled combat in the include... oops
Modified Paths:
--------------
trunk/src/mechanics.h
Modified: trunk/src/mechanics.h
===================================================================
--- trunk/src/mechanics.h 2012-11-16 20:59:38 UTC (rev 40)
+++ trunk/src/mechanics.h 2012-11-16 21:11:22 UTC (rev 41)
@@ -8,7 +8,7 @@
#define _mechanics_h
#include "frame.h"
-#include "vombat.h"
+#include "combat.h"
#include "findpath.h"
#include "gtime.h"
#include "map.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-16 20:59:49
|
Revision: 40
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=40&view=rev
Author: pheonixstorm
Date: 2012-11-16 20:59:38 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
Last include change (I hope). Now all includes should be lowercase
Modified Paths:
--------------
trunk/src/action.c
trunk/src/advvis.c
trunk/src/ai.c
trunk/src/ai.h
trunk/src/astar.c
trunk/src/atmos.c
trunk/src/audio_id.c
trunk/src/base.h
trunk/src/bridge.c
trunk/src/bucket3d.c
trunk/src/buildpos.c
trunk/src/bullet.h
trunk/src/cdspan.c
trunk/src/cheat.c
trunk/src/clparse.c
trunk/src/cluster.c
trunk/src/cmddroid.c
trunk/src/cmddroid.h
trunk/src/combat.c
trunk/src/combat.h
trunk/src/component.c
trunk/src/config.c
trunk/src/config.h
trunk/src/console.c
trunk/src/csnap.c
trunk/src/data.c
trunk/src/design.c
trunk/src/difficulty.c
trunk/src/disp2d.c
trunk/src/display.c
trunk/src/display.h
trunk/src/display3d.c
trunk/src/display3d.h
trunk/src/display3ddef.h
trunk/src/displaydef.h
trunk/src/drive.c
trunk/src/droid.c
trunk/src/droid.h
trunk/src/edit2d.c
trunk/src/edit3d.c
trunk/src/effects.c
trunk/src/effects.h
trunk/src/environ.c
trunk/src/feature.c
trunk/src/feature.h
trunk/src/findpath.c
trunk/src/formation.c
trunk/src/formation.h
trunk/src/fpath.c
trunk/src/frontend.c
trunk/src/function.c
trunk/src/function.h
trunk/src/functiondef.h
trunk/src/game.c
trunk/src/gateway.c
trunk/src/gateway.h
trunk/src/gatewayroute.c
trunk/src/gatewayroute.h
trunk/src/gatewaysup.c
trunk/src/geometry.c
trunk/src/group.c
trunk/src/group.h
trunk/src/hci.c
trunk/src/hci.h
trunk/src/ingameop.c
trunk/src/init.c
trunk/src/intdisplay.c
trunk/src/intdisplay.h
trunk/src/intelmap.c
trunk/src/intimage.c
trunk/src/intorder.c
trunk/src/keybind.c
trunk/src/keyedit.c
trunk/src/keymap.c
trunk/src/level_l.c
trunk/src/levels.c
trunk/src/lighting.c
trunk/src/lighting.h
trunk/src/loadsave.c
trunk/src/loop.c
trunk/src/loop.h
trunk/src/map.c
trunk/src/map.h
trunk/src/mapdisplay.c
trunk/src/mapdisplay.h
trunk/src/mapgrid.c
trunk/src/mechanics.c
trunk/src/mechanics.h
trunk/src/message.c
trunk/src/message.h
trunk/src/messagedef.h
trunk/src/miscimd.c
trunk/src/mission.c
trunk/src/move.c
trunk/src/move.h
trunk/src/mpdpxtra.c
trunk/src/multibot.c
trunk/src/multigifts.c
trunk/src/multiint.c
trunk/src/multijoin.c
trunk/src/multimenu.c
trunk/src/multiopt.c
trunk/src/multiplay.c
trunk/src/multistat.c
trunk/src/multistruct.c
trunk/src/multisync.c
trunk/src/objectdef.h
trunk/src/objects.c
trunk/src/objects.h
trunk/src/objmem.c
trunk/src/objmem.h
trunk/src/oprint.c
trunk/src/optimisepath.c
trunk/src/order.c
trunk/src/order.h
trunk/src/player.c
trunk/src/power.c
trunk/src/powercrypt.c
trunk/src/projectile.c
trunk/src/radar.c
trunk/src/raycast.c
trunk/src/readfiles.c
trunk/src/research.c
trunk/src/research.h
trunk/src/scores.c
trunk/src/scriptai.c
trunk/src/scriptcb.c
trunk/src/scriptextern.c
trunk/src/scriptfuncs.c
trunk/src/scriptobj.c
trunk/src/scripttabs.c
trunk/src/scriptvals.c
trunk/src/scriptvals_l.c
trunk/src/scriptvals_y.c
trunk/src/selection.c
trunk/src/seqdisp.c
trunk/src/seqdisp.h
trunk/src/stats.c
trunk/src/stats.h
trunk/src/structure.c
trunk/src/structure.h
trunk/src/target.c
trunk/src/text.c
trunk/src/texture.c
trunk/src/transporter.c
trunk/src/visibility.c
trunk/src/warcam.c
trunk/src/warcam.h
trunk/src/warzoneconfig.c
trunk/src/water.c
trunk/src/winmain.c
trunk/src/wrappers.c
Modified: trunk/src/action.c
===================================================================
--- trunk/src/action.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/action.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -15,22 +15,22 @@
//#define DEBUG_GROUP3
// VTOL rearming printf's
//#define DEBUG_GROUP4
-#include "Frame.h"
-#include "Objects.h"
-#include "Action.h"
-#include "Map.h"
-#include "Combat.h"
-#include "Geometry.h"
-#include "GTime.h"
+#include "frame.h"
+#include "objects.h"
+#include "action.h"
+#include "map.h"
+#include "combat.h"
+#include "geometry.h"
+#include "gtime.h"
#include "ivisdef.h"
-#include "Visibility.h"
-#include "Projectile.h"
-#include "Order.h"
-#include "HCI.h"
-#include "Transporter.h"
-#include "Console.h"
-#include "Research.h"
-#include "Drive.h"
+#include "visibility.h"
+#include "projectile.h"
+#include "order.h"
+#include "hci.h"
+#include "transporter.h"
+#include "console.h"
+#include "research.h"
+#include "drive.h"
#include "mission.h"
#include "audio_id.h"
#include "multiplay.h"
Modified: trunk/src/advvis.c
===================================================================
--- trunk/src/advvis.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/advvis.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -3,16 +3,16 @@
/* Makes smooth transitions for terrain visibility */
#include "frame.h"
-#include "Objects.h"
-#include "Base.h"
-#include "Map.h"
-#include "GTime.h"
-#include "Display3d.h"
+#include "objects.h"
+#include "base.h"
+#include "map.h"
+#include "gtime.h"
+#include "display3d.h"
#include "advvis.h"
-#include "HCI.h"
-#include "PieState.h"
-#include "Component.h"
-#include "Geometry.h"
+#include "hci.h"
+#include "piestate.h"
+#include "component.h"
+#include "geometry.h"
/* This uses oodles of memory and so can only be done on the PC */
@@ -245,4 +245,3 @@
}
// ------------------------------------------------------------------------------------
-
Modified: trunk/src/ai.c
===================================================================
--- trunk/src/ai.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/ai.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,23 +7,23 @@
/* Droid attack printf's */
//#define DEBUG_GROUP1
-#include "Frame.h"
-#include "Objects.h"
-#include "Map.h"
-#include "FindPath.h"
-#include "Visibility.h"
-#include "GTime.h"
-#include "Combat.h"
-#include "HCI.h"
-#include "Player.h"
+#include "frame.h"
+#include "objects.h"
+#include "map.h"
+#include "findpath.h"
+#include "visibility.h"
+#include "gtime.h"
+#include "combat.h"
+#include "hci.h"
+#include "player.h"
#include "power.h"
-#include "Geometry.h"
-#include "Order.h"
-#include "Action.h"
-#include "MapGrid.h"
-#include "Drive.h"
-#include "Projectile.h"
-#include "CmdDroid.h"
+#include "geometry.h"
+#include "order.h"
+#include "action.h"
+#include "mapgrid.h"
+#include "drive.h"
+#include "projectile.h"
+#include "cmddroid.h"
#include "group.h"
#include "multiplay.h"
Modified: trunk/src/ai.h
===================================================================
--- trunk/src/ai.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/ai.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _ai_h
#define _ai_h
-#include "ObjectDef.h"
+#include "objectdef.h"
#define ALLIANCE_BROKEN 0 // states of alliance between players
#define ALLIANCE_REQUESTED 1
Modified: trunk/src/astar.c
===================================================================
--- trunk/src/astar.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/astar.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -13,18 +13,18 @@
//#define DEBUG_GROUP2
#include <assert.h>
-#include "Frame.h"
+#include "frame.h"
-#include "Objects.h"
-#include "Map.h"
-#include "RayCast.h"
-#include "FPath.h"
+#include "objects.h"
+#include "map.h"
+#include "raycast.h"
+#include "fpath.h"
#ifdef TEST_BED
#include "main.h"
#endif
-#include "AStar.h"
+#include "astar.h"
// open list storage methods :
// binary tree - 0
Modified: trunk/src/atmos.c
===================================================================
--- trunk/src/atmos.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/atmos.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -4,21 +4,21 @@
At present, the water effects are part of the atmos
system and aren't properly implemented in the software mode
*/
-#include "Frame.h"
-#include "PieDef.h"
-#include "PieState.h"
-#include "Display3D.h"
-#include "Display3dDef.h"
-#include "GTime.h"
-#include "MiscImd.h"
-#include "Map.h"
-#include "Atmos.h"
-#include "Loop.h"
-#include "Geo.h"
-#include "Effects.h"
+#include "frame.h"
+#include "piedef.h"
+#include "piestate.h"
+#include "display3d.h"
+#include "display3ddef.h"
+#include "gtime.h"
+#include "miscimd.h"
+#include "map.h"
+#include "atmos.h"
+#include "loop.h"
+#include "geo.h"
+#include "effects.h"
#include "lighting.h"
#include "bucket3d.h"
-#include "HCI.h"
+#include "hci.h"
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
Modified: trunk/src/audio_id.c
===================================================================
--- trunk/src/audio_id.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/audio_id.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -6,7 +6,7 @@
*/
/***************************************************************************/
-#include "Frame.h"
+#include "frame.h"
#include "audio_id.h"
/***************************************************************************/
Modified: trunk/src/base.h
===================================================================
--- trunk/src/base.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/base.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -12,8 +12,8 @@
/***************************************************************************/
-#include "Deliverance.h"
-#include "DisplayDef.h"
+#include "deliverance.h"
+#include "displaydef.h"
#define TURRET_ROTATION_RATE 360
/***************************************************************************/
Modified: trunk/src/bridge.c
===================================================================
--- trunk/src/bridge.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/bridge.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -1,14 +1,3 @@
-#include "Frame.h"
-#include "Map.h"
-#include "HCI.h"
-#include "MapDisplay.h"
-#include "Display3D.h"
-#include "ivisdef.h" //ivis matrix code
-#include "piedef.h" //pie render
-#include "geo.h" //ivis matrix code
-#include "MiscImd.h"
-#include "Effects.h"
-#include "Bridge.h"
/*
Bridge.c
Alex McLean, Pumpkin Studios EIDOS Interactive, 1998.
@@ -17,6 +6,17 @@
the final game, but we'll see...
*/
+#include "frame.h"
+#include "map.h"
+#include "hci.h"
+#include "mapdisplay.h"
+#include "display3d.h"
+#include "ivisdef.h" //ivis matrix code
+#include "piedef.h" //pie render
+#include "geo.h" //ivis matrix code
+#include "miscimd.h"
+#include "effects.h"
+#include "bridge.h"
/*
Returns TRUE or FALSE as to whether a bridge is valid.
@@ -79,7 +79,6 @@
return(TRUE);
}
-
/*
This function will actually draw a wall section
Slightly different from yer basic structure draw in that
@@ -286,5 +285,3 @@
}
}
-
-
Modified: trunk/src/bucket3d.c
===================================================================
--- trunk/src/bucket3d.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/bucket3d.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -8,21 +8,22 @@
/* Includes direct access to matrix code */
#include "piedef.h"
-#include "pieState.h"
+#include "piestate.h"
#include "rendmode.h"
#include "geo.h"//matrix code
+
/* Includes from PUMPKIN stuff */
-#include "Frame.h"
-#include "ObjectDef.h"
+#include "frame.h"
+#include "objectdef.h"
#include "map.h"
-#include "Display3D.h"
-#include "MiscImd.h"
-#include "Effects.h"
-#include "Component.h"
-#include "bucket3D.h"
+#include "display3d.h"
+#include "miscimd.h"
+#include "effects.h"
+#include "component.h"
+#include "bucket3d.h"
#include "message.h"
-#include "Console.h"
-#include "Atmos.h"
+#include "console.h"
+#include "atmos.h"
#define NUM_BUCKETS 8000
Modified: trunk/src/buildpos.c
===================================================================
--- trunk/src/buildpos.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/buildpos.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,12 +7,12 @@
#if 0
-#include "Frame.h"
-#include "Objects.h"
-#include "Map.h"
-#include "Cluster.h"
+#include "frame.h"
+#include "objects.h"
+#include "map.h"
+#include "cluster.h"
-#include "BuildPos.h"
+#include "buildpos.h"
// the directions for placing structures
Modified: trunk/src/bullet.h
===================================================================
--- trunk/src/bullet.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/bullet.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -9,7 +9,7 @@
#ifndef _bullet_h
#define _bullet_h
-#include "ObjectDef.h"
+#include "objectdef.h"
/* The active bullets */
PROJ_OBJECT *psActiveBullets;
Modified: trunk/src/cdspan.c
===================================================================
--- trunk/src/cdspan.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/cdspan.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -1,19 +1,19 @@
/* Handles the two CD issue */
/* Alex McLean */
-#include "Frame.h"
-#include "pieDef.h"
-#include "pieFunc.h"
-#include "pieMode.h"
-#include "pieState.h"
-#include "Text.h"
-#include "DisplayDef.h"
-#include "RendMode.h"
-#include "HCI.h"
+#include "frame.h"
+#include "piedef.h"
+#include "piefunc.h"
+#include "piemode.h"
+#include "piestate.h"
+#include "text.h"
+#include "displaydef.h"
+#include "rendmode.h"
+#include "hci.h"
#include "intdisplay.h"
#include "audio.h"
#include "cdaudio.h"
-#include "CDSpan.h"
+#include "cdspan.h"
// turn on/off checks
#if 1
Modified: trunk/src/cheat.c
===================================================================
--- trunk/src/cheat.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/cheat.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -1,10 +1,10 @@
/* Handles cheat codes for Warzone */
/* Alex M 19th - Jan. 1999 */
-#include "Frame.h"
-#include "Cheat.h"
-#include "Console.h"
-#include "Keybind.h"
+#include "frame.h"
+#include "cheat.h"
+#include "console.h"
+#include "keybind.h"
static BOOL bAllowCheatCodes = TRUE;
Modified: trunk/src/clparse.c
===================================================================
--- trunk/src/clparse.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/clparse.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -5,26 +5,26 @@
*
*/
-#include "Direct.h"
+#include <Direct.h>
-#include "Frame.h"
-#include "Widget.h"
+#include "frame.h"
+#include "widget.h"
-#include "WinMain.h"
-#include "FrontEnd.h"
+#include "winmain.h"
+#include "frontend.h"
-#include "PieClip.h"
-#include "warzoneConfig.h"
+#include "pieclip.h"
+#include "warzoneconfig.h"
-#include "clParse.h"
-#include "pieState.h"
+#include "clparse.h"
+#include "piestate.h"
#include "loadsave.h"
-#include "Objects.h"
-#include "AdvVis.h"
+#include "objects.h"
+#include "advvis.h"
#include "multiplay.h"
#include "multiint.h"
#include "netplay.h"
-#include "Wrappers.h"
+#include "wrappers.h"
#include "cheat.h"
BOOL scanGameSpyFlags(LPSTR gflag,LPSTR value);
Modified: trunk/src/cluster.c
===================================================================
--- trunk/src/cluster.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/cluster.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,16 +7,16 @@
// cluster empty printf's
//#define DEBUG_GROUP0
-#include "Frame.h"
-#include "Objects.h"
-#include "Map.h"
-#include "Cluster.h"
-#include "Console.h"
-#include "HCI.h"
-#include "Gtime.h"
-#include "Script.h"
-#include "ScriptTabs.h"
-#include "ScriptCB.h"
+#include "frame.h"
+#include "objects.h"
+#include "map.h"
+#include "cluster.h"
+#include "console.h"
+#include "hci.h"
+#include "gtime.h"
+#include "script.h"
+#include "scripttabs.h"
+#include "scriptcb.h"
// distance between units for them to be in the same cluster
#define CLUSTER_DIST (TILE_UNITS*8)
Modified: trunk/src/cmddroid.c
===================================================================
--- trunk/src/cmddroid.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/cmddroid.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -5,13 +5,13 @@
*
*/
-#include "Frame.h"
-#include "Objects.h"
-#include "CmdDroidDef.h"
-#include "CmdDroid.h"
-#include "GTime.h"
-#include "Group.h"
-#include "Order.h"
+#include "frame.h"
+#include "objects.h"
+#include "cmddroiddef.h"
+#include "cmddroid.h"
+#include "gtime.h"
+#include "group.h"
+#include "order.h"
#include "multiplay.h"
extern UDWORD selectedPlayer;
Modified: trunk/src/cmddroid.h
===================================================================
--- trunk/src/cmddroid.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/cmddroid.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _cmddroid_h
#define _cmddroid_h
-#include "CmdDroidDef.h"
+#include "cmddroiddef.h"
// The number of available command droids for each player
//extern SWORD numCommandDroids[MAX_PLAYERS];
Modified: trunk/src/combat.c
===================================================================
--- trunk/src/combat.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/combat.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -13,24 +13,24 @@
//#define DEBUG_GROUP2
/* Turn on Missed printf's */
//#define DEBUG_GROUP3
-#include "Frame.h"
+#include "frame.h"
-#include "Objects.h"
-#include "Combat.h"
-#include "Stats.h"
-#include "Visibility.h"
-#include "GTime.h"
-#include "Map.h"
-#include "Move.h"
-#include "FindPath.h"
-#include "MessageDef.h"
-#include "MiscImd.h"
+#include "objects.h"
+#include "combat.h"
+#include "stats.h"
+#include "visibility.h"
+#include "gtime.h"
+#include "map.h"
+#include "move.h"
+#include "findpath.h"
+#include "messagedef.h"
+#include "miscimd.h"
#include "projectile.h"
#include "audio.h"
#include "audio_id.h"
-#include "Geometry.h"
-#include "CmdDroid.h"
-#include "mapGrid.h"
+#include "geometry.h"
+#include "cmddroid.h"
+#include "mapgrid.h"
#include "order.h"
#include "ai.h"
#include "action.h"
Modified: trunk/src/combat.h
===================================================================
--- trunk/src/combat.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/combat.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,8 +7,8 @@
#ifndef _combat_h
#define _combat_h
-#include "Frame.h"
-#include "Objects.h"
+#include "frame.h"
+#include "objects.h"
/* The range out of which the random number for the to hit should be taken */
#define HIT_DICE 100
Modified: trunk/src/component.c
===================================================================
--- trunk/src/component.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/component.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -5,17 +5,17 @@
*/
-#include "Frame.h"
-#include "Base.h"
-#include "Droid.h"
+#include "frame.h"
+#include "base.h"
+#include "droid.h"
#include "action.h"
#include "order.h"
-#include "Component.h"
+#include "component.h"
#include "ivisdef.h" //ivis matrix code
#include "geo.h" //ivis matrix code
#include "piedef.h" //ivis matrix code
-#include "pieState.h" //ivis render code
-#include "Lighting.h"
+#include "piestate.h" //ivis render code
+#include "lighting.h"
#define TESTLOWPOLY
@@ -24,19 +24,19 @@
#define GetRadius(x) ((x)->sradius)
-#include "Stats.h"
-#include "PieMode.h"
-#include "Objects.h"
-#include "Display.h"
-#include "Geometry.h"
-#include "Display3d.h"
-#include "Map.h"
-#include "GTime.h"
-#include "IntDisplay.h"
-#include "MiscImd.h"
-#include "Effects.h"
-#include "Transporter.h"
-#include "Projectile.h"
+#include "stats.h"
+#include "piemode.h"
+#include "objects.h"
+#include "display.h"
+#include "geometry.h"
+#include "display3d.h"
+#include "map.h"
+#include "gtime.h"
+#include "intdisplay.h"
+#include "miscimd.h"
+#include "effects.h"
+#include "transporter.h"
+#include "projectile.h"
void unsetMatrix(void);
void setMatrix(iVector *Position,iVector *Rotation,iVector *CameraPos,BOOL RotXYZ);
Modified: trunk/src/config.c
===================================================================
--- trunk/src/config.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/config.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -10,7 +10,7 @@
#include "track.h" // audio
#include "cdaudio.h" // audio
#include "piestate.h" // setgamma.
-#include "warzoneConfig.h" // renderMode
+#include "warzoneconfig.h" // renderMode
#include "component.h"
#include "text.h"
#include "seqdisp.h"
@@ -19,11 +19,12 @@
#include "display3d.h"
#include "multiplay.h"
#include "ai.h"
-#include "AdvVis.h"
+#include "advvis.h"
#include "mixer.h"
-#include "HCI.h"
-#include "Fpath.h"
+#include "hci.h"
+#include "fpath.h"
#include "d3drender.h"
+#include "config.h"
// ////////////////////////////////////////////////////////////////////////////
@@ -34,6 +35,7 @@
#define DEFAULTMAPNAME "Rush"
// ////////////////////////////////////////////////////////////////////////////
+/*
BOOL openWarzoneKey (VOID);
BOOL closeWarzoneKey (VOID);
BOOL getWarzoneKeyNumeric (STRING *pName,DWORD *val);
@@ -45,7 +47,7 @@
BOOL loadRenderMode (VOID);
BOOL loadConfig (BOOL bResourceAvailable);
BOOL saveConfig (VOID);
-
+*/
static HKEY ghWarzoneKey=NULL;
extern char sForceName[256];
Modified: trunk/src/config.h
===================================================================
--- trunk/src/config.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/config.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -2,6 +2,8 @@
* config.h
* load and save favourites to the registry.
*/
+#ifndef config_h
+#define config_h
extern BOOL loadConfig (BOOL bResourceAvailable);
extern BOOL loadRenderMode (VOID);
@@ -12,3 +14,10 @@
extern BOOL setWarzoneKeyNumeric (STRING *pName,DWORD val);
extern BOOL bAllowSubtitles;
+
+BOOL getWarzoneKeyString (STRING *pName,STRING *pString);
+BOOL getWarzoneKeyBinary (STRING *pName,UCHAR *pData,UDWORD *pSize);
+BOOL setWarzoneKeyString (STRING *pName,STRING *pString);
+BOOL setWarzoneKeyBinary (STRING *pName, VOID *pData, UDWORD size);
+
+#endif
Modified: trunk/src/console.c
===================================================================
--- trunk/src/console.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/console.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -1,14 +1,14 @@
-#include "Frame.h"
-#include "GTime.h"
-#include "Base.h"
+#include "frame.h"
+#include "gtime.h"
+#include "base.h"
#include "piedef.h"
#include "piestate.h"
#include "rendmode.h"
-#include "intImage.h"
-#include "Console.h"
-#include "ScriptExtern.h"
-#include "Audio_id.h"
-#include "Audio.h"
+#include "intimage.h"
+#include "console.h"
+#include "scriptextern.h"
+#include "audio_id.h"
+#include "audio.h"
/* Alex McLean, Pumpkin Studios, EIDOS Interactive */
Modified: trunk/src/csnap.c
===================================================================
--- trunk/src/csnap.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/csnap.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -6,15 +6,15 @@
#include <stdio.h>
#include <math.h>
-#include "Frame.h"
-#include "Widget.h"
+#include "frame.h"
+#include "widget.h"
#include "deliverance.h"
-#include "Fractions.h"
+#include "fractions.h"
-#include "PieState.h"
-#include "PieClip.h"
+#include "piestate.h"
+#include "pieclip.h"
-#include "CSnap.h"
+#include "csnap.h"
#include "audio_id.h"
#define V_BIAS 8
Modified: trunk/src/data.c
===================================================================
--- trunk/src/data.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/data.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -8,7 +8,7 @@
#include <assert.h>
-#include "Frame.h"
+#include "frame.h"
//render library
#include "piedef.h"
#include "piestate.h"
@@ -17,34 +17,34 @@
#include "bitimage.h"
#include "texture.h"
-#include "warzoneConfig.h"
+#include "warzoneconfig.h"
#include "tex.h"
#include "textdraw.h"
-#include "FrameResource.h"
-#include "Stats.h"
-#include "Structure.h"
-#include "Feature.h"
+#include "frameresource.h"
+#include "stats.h"
+#include "structure.h"
+#include "feature.h"
#include "research.h"
-#include "Data.h"
-#include "Text.h"
+#include "data.h"
+#include "text.h"
#include "droid.h"
#include "function.h"
#include "message.h"
-#include "Script.h"
-#include "ScriptVals.h"
+#include "script.h"
+#include "scriptvals.h"
#include "display3d.h"
#include "game.h"
-#include "Objects.h"
+#include "objects.h"
#include "display.h"
#include "audio.h"
#include "anim.h"
#include "parser.h"
-#include "Levels.h"
-#include "Mechanics.h"
-#include "Display3d.h"
-#include "Display3ddef.h"
-#include "Init.h"
+#include "levels.h"
+#include "mechanics.h"
+#include "display3d.h"
+#include "display3ddef.h"
+#include "init.h"
#include "multiplay.h"
#include "netplay.h"
Modified: trunk/src/design.c
===================================================================
--- trunk/src/design.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/design.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -8,34 +8,34 @@
#include <stdio.h>
#include <math.h>
-#include "Frame.h"
-#include "Widget.h"
+#include "frame.h"
+#include "widget.h"
-#include "Objects.h"
-#include "Loop.h"
-#include "Edit2D.h"
-#include "Map.h"
+#include "objects.h"
+#include "loop.h"
+#include "edit2d.h"
+#include "map.h"
/* Includes direct access to render library */
#include "ivisdef.h"
#include "vid.h"
-#include "pieMatrix.h"//matrix code
-#include "pieState.h"
+#include "piematrix.h"//matrix code
+#include "piestate.h"
-#include "Display3d.h"
-#include "Edit3D.h"
-#include "Disp2D.h"
-#include "Structure.h"
-#include "Research.h"
-#include "Function.h"
-#include "GTime.h"
-#include "HCI.h"
-#include "Stats.h"
+#include "display3d.h"
+#include "edit3d.h"
+#include "disp2d.h"
+#include "structure.h"
+#include "research.h"
+#include "function.h"
+#include "gtime.h"
+#include "hci.h"
+#include "stats.h"
#include "game.h"
#include "power.h"
#include "audio.h"
#include "audio_id.h"
-#include "WidgInt.h"
+#include "widgint.h"
#include "bar.h"
#include "form.h"
#include "label.h"
@@ -43,23 +43,23 @@
#include "editbox.h"
#include "slider.h"
#include "fractions.h"
-#include "Order.h"
-#include "Projectile.h"
+#include "order.h"
+#include "projectile.h"
-#include "IntImage.h"
-#include "IntDisplay.h"
-#include "Design.h"
-#include "Text.h"
+#include "intimage.h"
+#include "intdisplay.h"
+#include "design.h"
+#include "text.h"
#include "component.h"
-#include "Script.h"
-#include "scriptTabs.h"
-#include "WinMain.h"
-#include "Objects.h"
+#include "script.h"
+#include "scripttabs.h"
+#include "winmain.h"
+#include "objects.h"
#include "display.h"
-#include "Console.h"
-#include "CmdDroid.h"
-#include "ScriptExtern.h"
-#include "MultiPlay.h"
+#include "console.h"
+#include "cmddroid.h"
+#include "scriptextern.h"
+#include "multiplay.h"
#include "multistat.h"
#define FLASH_BUTTONS // Enable flashing body part buttons.
Modified: trunk/src/difficulty.c
===================================================================
--- trunk/src/difficulty.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/difficulty.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -9,8 +9,8 @@
// ------------------------------------------------------------------------------------
-#include "Frame.h"
-#include "Difficulty.h"
+#include "frame.h"
+#include "difficulty.h"
// ------------------------------------------------------------------------------------
DIFFICULTY_LEVEL presDifLevel = DL_NORMAL;
FRACT fDifPlayerModifier;
Modified: trunk/src/disp2d.c
===================================================================
--- trunk/src/disp2d.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/disp2d.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -17,23 +17,23 @@
//#define DEBUG_GROUP1
/* Surf recreate bitmap */
//#define DEBUG_GROUP2
-#include "Frame.h"
-#include "FrameInt.h"
-#include "Map.h"
-#include "Disp2D.h"
-#include "Objects.h"
-#include "Display.h"
-#include "Loop.h"
-#include "GTime.h"
-#include "Findpath.h"
-#include "Display3D.h"
-#include "Edit2D.h"
-#include "HCI.h"
-#include "Player.h"
-#include "Order.h"
-#include "Geometry.h"
-#include "Component.h"
-#include "Projectile.h"
+#include "frame.h"
+#include "frameint.h"
+#include "map.h"
+#include "disp2d.h"
+#include "objects.h"
+#include "display.h"
+#include "loop.h"
+#include "gtime.h"
+#include "findpath.h"
+#include "display3d.h"
+#include "edit2d.h"
+#include "hci.h"
+#include "player.h"
+#include "order.h"
+#include "geometry.h"
+#include "component.h"
+#include "projectile.h"
//#include "netplay.h"
//#include "MultiPlay.h"
Modified: trunk/src/display.c
===================================================================
--- trunk/src/display.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/display.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -5,71 +5,65 @@
*
*/
+#include "frame.h"
+#include "display.h"
+#include "map.h"
+#include "disp2d.h"
+#include "loop.h"
+#include "atmos.h" // temporary only for here
+#include "csnap.h"
-
-#include "Frame.h"
-#include "Display.h"
-#include "Map.h"
-#include "Disp2D.h"
-#include "Loop.h"
-#include "Atmos.h" // temporary only for here
-#include "CSnap.h"
-
/* Includes direct access to render library */
#include "piedef.h"
-#include "pieState.h"
+#include "piestate.h"
#include "vid.h"
//#include "ivisheap.h"//make a call for this
#include "tex.h"//make a call for this
-#include "Component.h"
-#include "Display3D.h"
+#include "component.h"
+#include "display3d.h"
#include "resource.h"
-#include "HCI.h"
+#include "hci.h"
#include "text.h"
-#include "Edit3D.h"
-#include "Geometry.h"
-#include "GTime.h"
+#include "edit3d.h"
+#include "geometry.h"
+#include "gtime.h"
#include "audio.h"
#include "audio_id.h"
#include "radar.h"
-#include "MiscImd.h"
-#include "Lighting.h"
+#include "miscimd.h"
+#include "lighting.h"
#include "fractions.h"
-#include "Console.h"
-#include "Order.h"
-#include "Wrappers.h"
+#include "console.h"
+#include "order.h"
+#include "wrappers.h"
#include "power.h"
-#include "Map.h"
+#include "map.h"
#include "keymap.h"
-#include "intImage.h"
+#include "intimage.h"
#include "mechanics.h"
-#include "InGameOp.h"
-#include "oPrint.h"
-#include "WarCAM.h"
-#include "KeyBind.h"
-#include "KeyMap.h"
-#include "Projectile.h"
+#include "ingameop.h"
+#include "oprint.h"
+#include "Warcam.h"
+#include "keybind.h"
+#include "keymap.h"
+#include "projectile.h"
#include "message.h"
#include "effects.h"
-#include "Script.h"
-#include "ScriptTabs.h"
-#include "ScriptExtern.h"
-#include "ScriptCB.h"
+#include "script.h"
+#include "scripttabs.h"
+#include "scriptextern.h"
+#include "scriptcb.h"
#include "target.h"
#include "drive.h"
-#include "CmdDroid.h"
-#include "Gateway.h"
-#include "Selection.h"
-#include "Transporter.h"
-#include "intOrder.h"
+#include "cmddroid.h"
+#include "gateway.h"
+#include "selection.h"
+#include "transporter.h"
+#include "intorder.h"
-
-//#ifdef THREEDFX
-//#include "3dfxFunc.h"
-//#endif
-#include "pieClip.h" // ffs am
+#include "pieclip.h" // ffs am
#include "multiplay.h"
#define SHAKE_TIME (1500)
Modified: trunk/src/display.h
===================================================================
--- trunk/src/display.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/display.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -11,7 +11,7 @@
#define _display_h
#include "base.h"
-#include "Structure.h"
+#include "structure.h"
/* Initialise the display system */
extern BOOL dispInitialise(void);
Modified: trunk/src/display3d.c
===================================================================
--- trunk/src/display3d.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/display3d.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -12,73 +12,71 @@
#include <string.h>
/* Includes direct access to render library */
#include "piedef.h"
-#include "pieState.h"
-#include "pieTexture.h"
-#include "pieClip.h"
-#include "piePalette.h"
-#include "pieMatrix.h"
-#include "pieMode.h"
-#include "pieFunc.h"
-#include "rendMode.h"
+#include "piestate.h"
+#include "pietexture.h"
+#include "pieclip.h"
+#include "piepalette.h"
+#include "piematrix.h"
+#include "piemode.h"
+#include "piefunc.h"
+#include "rendmode.h"
#include "bspfunc.h"
-#include "Loop.h"
-#include "Atmos.h"
-#include "RayCast.h"
-#include "Levels.h"
-#ifdef JEREMY
-#include "groundMist.h"
-#endif
+#include "loop.h"
+#include "atmos.h"
+#include "raycast.h"
+#include "levels.h"
+
/* Includes from PUMPKIN stuff */
-#include "Frame.h"
-#include "Map.h"
-#include "Move.h"
-#include "Visibility.h"
-#include "Findpath.h"
-#include "Disp2D.h"
-#include "Geometry.h"
-#include "GTime.h"
+#include "frame.h"
+#include "map.h"
+#include "move.h"
+#include "visibility.h"
+#include "findpath.h"
+#include "disp2d.h"
+#include "geometry.h"
+#include "gtime.h"
#include "resource.h"
-#include "MessageDef.h"
-#include "MiscImd.h"
-#include "Effects.h"
-#include "Edit3D.h"
-#include "Feature.h"
-#include "HCI.h"
-#include "Display.h"
-#include "intDisplay.h"
-#include "Radar.h"
-#include "Display3D.h"
+#include "messagedef.h"
+#include "miscimd.h"
+#include "effects.h"
+#include "edit3d.h"
+#include "feature.h"
+#include "hci.h"
+#include "display.h"
+#include "intdisplay.h"
+#include "radar.h"
+#include "display3d.h"
#include "fractions.h"
-#include "Lighting.h"
-#include "Console.h"
+#include "lighting.h"
+#include "console.h"
#include "animobj.h"
#include "projectile.h"
#include "bucket3d.h"
#include "intelmap.h"
#include "mapdisplay.h"
#include "message.h"
-#include "Component.h"
-#include "Bridge.h"
-#include "WarCAM.h"
-#include "Script.h"
-#include "ScriptTabs.h"
-#include "ScriptExtern.h"
-#include "ScriptCB.h"
+#include "component.h"
+#include "bridge.h"
+#include "warcam.h"
+#include "script.h"
+#include "scripttabs.h"
+#include "scriptextern.h"
+#include "scriptcb.h"
#include "target.h"
#include "keymap.h"
#include "drive.h"
#include "fpath.h"
#include "gateway.h"
-#include "Transporter.h"
-#include "WarZoneConfig.h"
+#include "transporter.h"
+#include "warzoneconfig.h"
#include "audio.h"
#include "audio_id.h"
#include "action.h"
-#include "KeyBind.h"
-#include "Combat.h"
+#include "keybind.h"
+#include "combat.h"
#include "order.h"
-#include "Scores.h"
+#include "scores.h"
#ifdef ARROWS
#include "arrow.h"
#endif
@@ -86,16 +84,13 @@
#include "multiplay.h"
#include "environ.h"
-#include "AdvVis.h"
+#include "advvis.h"
-#include "Texture.h"
-//#ifdef THREEDFX
-//#include "Glide.h"
-//#endif
+#include "texture.h"
#include "anim_id.h"
-#include "CmdDroid.h"
+#include "cmddroid.h"
#define SPOTLIGHT
Modified: trunk/src/display3d.h
===================================================================
--- trunk/src/display3d.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/display3d.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -4,9 +4,9 @@
#define _display3d_h
#include "display3ddef.h" // This should be the only place including this file on the PC
-#include "PieTypes.h"
-#include "PieDef.h"
-#include "ObjectDef.h"
+#include "pietypes.h"
+#include "piedef.h"
+#include "objectdef.h"
#include "message.h"
extern BOOL xInOrder,yInOrder,yBeforeX,spinScene;
Modified: trunk/src/display3ddef.h
===================================================================
--- trunk/src/display3ddef.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/display3ddef.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -1,6 +1,7 @@
#ifndef _display3ddef_h
#define _display3ddef_h
+// FIXME wiggle room perhaps?
#define TILE_WIDTH 64
#define TILE_HEIGHT 64
#define TILE_SIZE (TILE_WIDTH*TILE_HEIGHT)
@@ -25,11 +26,14 @@
#define LAND_XGRD (VISIBLE_XTILES + 1)
#define LAND_YGRD (VISIBLE_YTILES + 1)
+
+// FIXME Map Zoom defs set min/max to wider def. maybe 5k/500?
#define DISTANCE (2600)
#define START_DISTANCE (2000)
#define MINDISTANCE (DISTANCE - DISTANCE/3)
+// FIXME Unknown... maybe WZP may know.
#define NUM_TILES 100 //5 pages of 16 tiles.
#define BOX_PULSE_SIZE 10
Modified: trunk/src/displaydef.h
===================================================================
--- trunk/src/displaydef.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/displaydef.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -8,7 +8,7 @@
#define _displaydef_h
#include "imd.h"
-#include "pieClip.h"
+#include "pieclip.h"
#define DISP_WIDTH (pie_GetVideoBufferWidth())
#define DISP_HEIGHT (pie_GetVideoBufferHeight())
#define DISP_HARDBITDEPTH (16)
Modified: trunk/src/drive.c
===================================================================
--- trunk/src/drive.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/drive.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -10,43 +10,43 @@
#include <Math.h>
#include "imd.h"
#include "vid.h"
-#include "Frame.h"
-#include "Objects.h"
-#include "Move.h"
-#include "FindPath.h"
-#include "Visibility.h"
-#include "Map.h"
-#include "FPath.h"
-#include "Loop.h"
-#include "GTime.h"
+#include "frame.h"
+#include "objects.h"
+#include "move.h"
+#include "findpath.h"
+#include "visibility.h"
+#include "map.h"
+#include "fpath.h"
+#include "loop.h"
+#include "gtime.h"
#include "audio.h"
#include "audio_id.h"
-#include "Geometry.h"
+#include "geometry.h"
#include "animobj.h"
#include "anim_id.h"
-#include "FormationDef.h"
-#include "Formation.h"
+#include "formationdef.h"
+#include "formation.h"
#include "action.h"
#include "order.h"
#include "astar.h"
-#include "Combat.h"
-#include "MapGrid.h"
+#include "combat.h"
+#include "mapgrid.h"
#include "display.h" // needed for widgetsOn flag.
-#include "Effects.h"
+#include "effects.h"
#include "fractions.h"
#include "hci.h"
#include "warcam.h"
#include "radar.h"
#include "display3ddef.h"
#include "display3d.h"
-#include "Console.h"
-#include "Text.h"
+#include "console.h"
+#include "text.h"
// all the bollox needed for script callbacks
#include "interp.h" // needed to define types in scripttabs.h
#include "parse.h" // needed to define types in scripttabs.h (Arse!)
#include "scripttabs.h" // needed to define the callback
-#include "ScriptExtern.h" // needed to include the GLOBAL for checking bInTutorial
+#include "scriptextern.h" // needed to include the GLOBAL for checking bInTutorial
#include "group.h"
#define DEBUG_DRIVE_SPEED
@@ -57,7 +57,7 @@
#define MINPITCH (768)
#define PITCHCHANGE (512)
-#include "MultiPlay.h"
+#include "multiplay.h"
#include "target.h"
#include "drive.h"
Modified: trunk/src/droid.c
===================================================================
--- trunk/src/droid.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/droid.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -10,20 +10,20 @@
/* Droid damage printf's */
//#define DEBUG_GROUP1
//#include <assert.h>
-#include "Frame.h"
-#include "Objects.h"
-#include "Loop.h"
-#include "Visibility.h"
+#include "frame.h"
+#include "objects.h"
+#include "loop.h"
+#include "visibility.h"
#include "map.h"
#include "drive.h"
//#include "Droid.h"
//#include "ObjMem.h"
-#include "HCI.h"
-#include "GTime.h"
+#include "hci.h"
+#include "gtime.h"
#include "game.h"
#include "power.h"
-#include "MiscImd.h"
-#include "Effects.h"
+#include "miscimd.h"
+#include "effects.h"
#include "feature.h"
#include "audio.h"
#include "audio_id.h"
@@ -34,36 +34,36 @@
#include "geo.h"
#include "anim_id.h"
#include "animobj.h"
-#include "Geometry.h"
+#include "geometry.h"
#include "display.h"
#include "console.h"
#include "component.h"
#include "function.h"
-#include "Lighting.h"
-#include "Gateway.h"
-#include "MultiPlay.h" //ajl
-#include "FormationDef.h"
-#include "Formation.h"
-#include "WarCam.h"
-#include "Display3d.h"
-#include "Group.h"
-#include "Text.h"
-#include "Script.h"
-#include "ScriptTabs.h"
-#include "ScriptCB.h"
-#include "CmdDroid.h"
-#include "fPath.h"
-#include "MapGrid.h"
-#include "Projectile.h"
-#include "Cluster.h"
-#include "Mission.h"
-#include "Levels.h"
-#include "Transporter.h"
-#include "Selection.h"
-#include "Difficulty.h"
-#include "Edit3D.h"
-#include "Scores.h"
-#include "Research.h"
+#include "lighting.h"
+#include "gateway.h"
+#include "multiplay.h" //ajl
+#include "formationdef.h"
+#include "formation.h"
+#include "warcam.h"
+#include "display3d.h"
+#include "group.h"
+#include "text.h"
+#include "script.h"
+#include "scripttabs.h"
+#include "scriptcb.h"
+#include "cmddroid.h"
+#include "fpath.h"
+#include "mapgrid.h"
+#include "projectile.h"
+#include "cluster.h"
+#include "mission.h"
+#include "levels.h"
+#include "transporter.h"
+#include "selection.h"
+#include "difficulty.h"
+#include "edit3d.h"
+#include "scores.h"
+#include "research.h"
#define DEFAULT_RECOIL_TIME (GAME_TICKS_PER_SEC/4)
#define DROID_DAMAGE_SPREAD (16 - rand()%32)
Modified: trunk/src/droid.h
===================================================================
--- trunk/src/droid.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/droid.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _droid_h
#define _droid_h
-#include "ObjectDef.h"
+#include "objectdef.h"
#define OFF_SCREEN 9999 // world->screen check - alex
Modified: trunk/src/edit2d.c
===================================================================
--- trunk/src/edit2d.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/edit2d.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -11,15 +11,15 @@
//#define DEBUG_GROUP2
/* Selection flip and rotate printf's */
//#define DEBUG_GROUP3
-#include "Frame.h"
-#include "FrameInt.h"
+#include "frame.h"
+#include "frameint.h"
-#include "GTime.h"
-#include "Map.h"
+#include "gtime.h"
+#include "map.h"
#include "ivi.h"
-#include "Display3d.h"
-#include "Disp2D.h"
-#include "Edit2D.h"
+#include "display3d.h"
+#include "disp2d.h"
+#include "edit2d.h"
/* Whether to show the terrain type on the map */
BOOL showTerrain = FALSE;
Modified: trunk/src/edit3d.c
===================================================================
--- trunk/src/edit3d.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/edit3d.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -4,13 +4,13 @@
Alex McLean, Pumpkin Studios, EIDOS Interactive, 1997
*/
-#include "Frame.h"
-#include "Map.h"
-#include "Edit3D.h"
-#include "Display3D.h"
-#include "Objects.h"
-#include "Display.h"
-#include "HCI.h"
+#include "frame.h"
+#include "map.h"
+#include "edit3d.h"
+#include "display3d.h"
+#include "objects.h"
+#include "display.h"
+#include "hci.h"
/*
Definition of a tile to highlight - presently more than is required
Modified: trunk/src/effects.c
===================================================================
--- trunk/src/effects.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/effects.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -16,30 +16,30 @@
#include <stdio.h>
#include <assert.h>
-#include "Frame.h"
+#include "frame.h"
#include "ivisdef.h" //ivis matrix code
#include "piedef.h" //ivis matrix code
-#include "pieState.h"
+#include "piestate.h"
#include "geo.h" //ivis matrix code
-#include "GTime.h"
-#include "Display3d.h"
-#include "Map.h"
-#include "Bucket3D.h"
-#include "pieMode.h"
-#include "Mission.h"
+#include "gtime.h"
+#include "display3d.h"
+#include "map.h"
+#include "bucket3d.h"
+#include "piemode.h"
+#include "mission.h"
/*Remove this one!!! :-( */
-#include "MiscImd.h"
-#include "Effects.h"
+#include "miscimd.h"
+#include "effects.h"
#include "audio.h"
#include "audio_id.h"
-#include "HCI.h"
-#include "Lighting.h"
-#include "Console.h"
-#include "Loop.h"
-#include "MultiPlay.h"
+#include "hci.h"
+#include "lighting.h"
+#include "console.h"
+#include "loop.h"
+#include "multiplay.h"
-#include "Game.h"
+#include "game.h"
//#define COUNTOFFSCREEN
#define DOLIGHTS
Modified: trunk/src/effects.h
===================================================================
--- trunk/src/effects.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/effects.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -8,7 +8,7 @@
Alex McLean, Pumpkin Studios, EIDOS Interactive, 1998.
*/
#include "piedef.h"
-#include "pieTypes.h"
+#include "pietypes.h"
/* All the effect groups */
typedef enum
Modified: trunk/src/environ.c
===================================================================
--- trunk/src/environ.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/environ.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -4,10 +4,10 @@
*/
// -------------------------------------------------------------------------------
-#include "Frame.h"
-#include "Map.h"
-#include "Display3D.h"
-#include "GTime.h"
+#include "frame.h"
+#include "map.h"
+#include "display3d.h"
+#include "gtime.h"
// -------------------------------------------------------------------------------
#define RANDOMLY_ONE_OR_MINUS_ONE (rand()%2 ? -1 : 1)
Modified: trunk/src/feature.c
===================================================================
--- trunk/src/feature.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/feature.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,31 +7,31 @@
#include <stdio.h>
#include <assert.h>
-#include "Frame.h"
-#include "Feature.h"
-#include "Map.h"
-#include "HCI.h"
-#include "GTime.h"
-#include "Power.h"
+#include "frame.h"
+#include "feature.h"
+#include "map.h"
+#include "hci.h"
+#include "gtime.h"
+#include "power.h"
#include "audio.h"
#include "audio_id.h"
-#include "Objects.h"
+#include "objects.h"
#include "display.h"
-#include "Console.h"
-#include "Order.h"
-#include "Structure.h"
-#include "MiscImd.h"
+#include "console.h"
+#include "order.h"
+#include "structure.h"
+#include "miscimd.h"
#include "anim_id.h"
-#include "Visibility.h"
+#include "visibility.h"
#include "text.h"
-#include "Effects.h"
-#include "Geometry.h"
-#include "Scores.h"
-#include "MultiPlay.h"
-#include "AdvVis.h"
-#include "MapGrid.h"
+#include "effects.h"
+#include "geometry.h"
+#include "scores.h"
+#include "multiplay.h"
+#include "advvis.h"
+#include "mapgrid.h"
#include "display3d.h"
-#include "Gateway.h"
+#include "gateway.h"
/* The statistics for the features */
FEATURE_STATS *asFeatureStats;
Modified: trunk/src/feature.h
===================================================================
--- trunk/src/feature.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/feature.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,8 @@
#ifndef _feature_h
#define _feature_h
-#include "ObjectDef.h"
+#include "objectdef.h"
+
#define ONEMIN (1000 * 60)
#define WRECK_LIFETIME (0) //they're just not there anymore!!!!! Ye ha!
Modified: trunk/src/findpath.c
===================================================================
--- trunk/src/findpath.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/findpath.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,13 +7,13 @@
/* Turn printf's */
//#define DEBUG_GROUP1
-#include "Frame.h"
+#include "frame.h"
-#include "Objects.h"
-#include "Map.h"
-#include "FindPath.h"
-#include "GTime.h"
-#include "Geometry.h"
+#include "objects.h"
+#include "map.h"
+#include "findpath.h"
+#include "gtime.h"
+#include "geometry.h"
#include "fractions.h"
@@ -878,11 +878,6 @@
#endif
-
-
-
-
-
/* Return the difference in directions */
UDWORD dirDiff(SDWORD start, SDWORD end)
{
Modified: trunk/src/formation.c
===================================================================
--- trunk/src/formation.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/formation.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,15 +7,15 @@
//#define DEBUG_GROUP0
-#include "Frame.h"
-#include "Objects.h"
-#include "Map.h"
-#include "AStar.h"
-#include "FPath.h"
-#include "Geometry.h"
+#include "frame.h"
+#include "objects.h"
+#include "map.h"
+#include "astar.h"
+#include "fpath.h"
+#include "geometry.h"
-#include "FormationDef.h"
-#include "Formation.h"
+#include "formationdef.h"
+#include "formation.h"
// radius for the different body sizes
Modified: trunk/src/formation.h
===================================================================
--- trunk/src/formation.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/formation.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _formation_h
#define _formation_h
-#include "FormationDef.h"
+#include "formationdef.h"
typedef enum _formation_type
{
Modified: trunk/src/fpath.c
===================================================================
--- trunk/src/fpath.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/fpath.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -12,7 +12,7 @@
// gateway route printf's
//#define DEBUG_GROUP2
-#include "Frame.h"
+#include "frame.h"
BOOL fpathDoMessage;
#undef DBP2
@@ -20,25 +20,25 @@
if (fpathDoMessage) \
DBPRINTF( x )
-#include "Objects.h"
-#include "Map.h"
-#include "RayCast.h"
-#include "Geometry.h"
-#include "HCI.h"
-#include "Order.h"
+#include "objects.h"
+#include "map.h"
+#include "raycast.h"
+#include "geometry.h"
+#include "hci.h"
+#include "order.h"
#ifdef TEST_BED
#include "main.h"
#endif
-#include "AStar.h"
-#include "LOSRoute.h"
-#include "Gateway.h"
-#include "GatewayRoute.h"
-#include "Action.h"
-#include "Formation.h"
+#include "astar.h"
+#include "losroute.h"
+#include "gateway.h"
+#include "gatewayroute.h"
+#include "action.h"
+#include "formation.h"
#define DEFINE_MAPINLINE
-#include "FPath.h"
+#include "fpath.h"
/* minimum height difference for VTOL blocking tile */
#define LIFT_BLOCK_HEIGHT_LIGHTBODY 30
Modified: trunk/src/frontend.c
===================================================================
--- trunk/src/frontend.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/frontend.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -5,25 +5,18 @@
* Alex Lee. Pumpkin Studios. Eidos PLC 98,
*/
-/* Playstation button symbol -> font mappings.
-| = X
-{ = Circle
-} = Square
-~ = Triangle
-*/
-
-#include "stdio.h"
-#include "Frame.h"
-#include "winMain.h"
-#include "Objects.h"
+#include <stdio.h>
+#include "frame.h"
+#include "winmain.h"
+#include "objects.h"
#include "display.h"
#include "widget.h"
/* Includes direct access to render library */
#include "ivisdef.h"
-#include "pieState.h"
+#include "piestate.h"
#include "keyedit.h"
-#include "pieFunc.h"
-#include "warzoneConfig.h"
+#include "piefunc.h"
+#include "warzoneconfig.h"
#include "vid.h"
#include "display3d.h"
@@ -37,21 +30,21 @@
#include "design.h" // for intadddesign
#include "hci.h" // for intShowPower
#include "text.h" // to get at string resources.
-#include "FrontEnd.h"
-#include "Console.h"
+#include "frontend.h"
+#include "console.h"
#include "wrappers.h"
#include "component.h"
#include "loadsave.h"
-#include "CSnap.h"
+#include "csnap.h"
//#include "wrappers.h" // for bUsingKeyboard.
-#include "Frend.h"
+#include "frend.h"
#include "game.h"
-#include "Init.h"
+#include "init.h"
#include "difficulty.h"
-#include "InGameOp.h"
+#include "ingameop.h"
#include "advvis.h"
-#include "seqDisp.h"
+#include "seqdisp.h"
#include "multiplay.h"
#include "multiint.h"
#include "multilimit.h"
Modified: trunk/src/function.c
===================================================================
--- trunk/src/function.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/function.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -6,9 +6,9 @@
*/
#include <stdio.h>
-#include "Frame.h"
+#include "frame.h"
#include "function.h"
-#include "Stats.h"
+#include "stats.h"
#include "structure.h"
#include "text.h"
#include "research.h"
Modified: trunk/src/function.h
===================================================================
--- trunk/src/function.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/function.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _function_h
#define _function_h
-#include "ObjectDef.h"
+#include "objectdef.h"
//holder for all functions
Modified: trunk/src/functiondef.h
===================================================================
--- trunk/src/functiondef.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/functiondef.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _functiondef_h
#define _functiondef_h
-#include "StatsDef.h"
+#include "statsdef.h"
enum FUNCTION_TYPES
Modified: trunk/src/game.c
===================================================================
--- trunk/src/game.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/game.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -4,54 +4,54 @@
#include <assert.h>
/* Warzone src and library headers */
-#include "Frame.h"
-#include "FrameInt.h"
+#include "frame.h"
+#include "frameint.h"
#include "ivis02.h"
-#include "Script.h"
-#include "GTime.h"
-#include "Map.h"
+#include "script.h"
+#include "gtime.h"
+#include "map.h"
#include "edit2d.h"
#include "droid.h"
#include "action.h"
#include "game.h"
#include "research.h"
#include "power.h"
-#include "Player.h"
+#include "player.h"
#include "projectile.h"
-#include "LoadSave.h"
+#include "loadsave.h"
#include "text.h"
#include "message.h"
-#include "HCI.h"
-#include "Display.h"
-#include "Display3d.h"
-#include "Map.h"
-#include "Effects.h"
+#include "hci.h"
+#include "display.h"
+#include "display3d.h"
+#include "map.h"
+#include "effects.h"
#include "init.h"
#include "mission.h"
-#include "pieState.h"
-#include "Scores.h"
+#include "piestate.h"
+#include "scores.h"
#include "audio_id.h"
#include "anim_id.h"
#include "design.h"
#include "lighting.h"
-#include "Component.h"
-#include "Radar.h"
-#include "CmdDroid.h"
-#include "Formation.h"
-#include "FormationDef.h"
-#include "warzoneConfig.h"
-#include "MultiPlay.h"
-#include "NetPlay.h"
-#include "FrontEnd.h"
-#include "Levels.h"
-#include "Mission.h"
-#include "Geometry.h"
+#include "component.h"
+#include "radar.h"
+#include "cmddroid.h"
+#include "formation.h"
+#include "formationdef.h"
+#include "warzoneconfig.h"
+#include "multiplay.h"
+#include "netplay.h"
+#include "frontend.h"
+#include "levels.h"
+#include "mission.h"
+#include "geometry.h"
#include "audio.h"
-#include "Gateway.h"
-#include "ScriptTabs.h"
-#include "ScriptExtern.h"
+#include "gateway.h"
+#include "scripttabs.h"
+#include "scriptextern.h"
#include "multistat.h"
-#include "Wrappers.h"
+#include "wrappers.h"
#define ALLOWSAVE
Modified: trunk/src/gateway.c
===================================================================
--- trunk/src/gateway.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/gateway.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -55,14 +55,14 @@
//#define DEBUG_GROUP0
// water gate printf's
//#define DEBUG_GROUP1
-#include "Frame.h"
-#include "Map.h"
-#include "Astar.h"
-#include "FPath.h"
-#include "Wrappers.h"
+#include "frame.h"
+#include "map.h"
+#include "astar.h"
+#include "fpath.h"
+#include "wrappers.h"
#endif
-#include "Gateway.h"
+#include "gateway.h"
// the list of gateways on the current map
GATEWAY *psGateways;
Modified: trunk/src/gateway.h
===================================================================
--- trunk/src/gateway.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/gateway.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _gateway_h
#define _gateway_h
-#include "GatewayDef.h"
+#include "gatewaydef.h"
// the list of gateways on the current map
extern GATEWAY *psGateways;
Modified: trunk/src/gatewayroute.c
===================================================================
--- trunk/src/gatewayroute.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/gatewayroute.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -8,7 +8,7 @@
// print out the final route
//#define DEBUG_GROUP1
-#include "Frame.h"
+#include "frame.h"
BOOL gwrDoMessage;
#undef DBP0
@@ -17,10 +17,10 @@
DBPRINTF( x )
-#include "Map.h"
-#include "Gateway.h"
-#include "GatewayRoute.h"
-#include "Fpath.h"
+#include "map.h"
+#include "gateway.h"
+#include "gatewayroute.h"
+#include "fpath.h"
// the open list
static GATEWAY *psOpenList;
Modified: trunk/src/gatewayroute.h
===================================================================
--- trunk/src/gatewayroute.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/gatewayroute.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,7 +7,7 @@
#ifndef _gatewayroute_h
#define _gatewayroute_h
-#include "Gateway.h"
+#include "gateway.h"
// what type of terrain the unit can move over
enum _gwr_terrain_types
Modified: trunk/src/gatewaysup.c
===================================================================
--- trunk/src/gatewaysup.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/gatewaysup.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -30,13 +30,13 @@
#else
-#include "Frame.h"
-#include "Map.h"
+#include "frame.h"
+#include "map.h"
#endif
#include "assert.h"
-#include "Gateway.h"
+#include "gateway.h"
// Structures and defines for SeedFill().
typedef int Pixel; /* 1-channel frame buffer assumed */
Modified: trunk/src/geometry.c
===================================================================
--- trunk/src/geometry.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/geometry.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -1,7 +1,7 @@
/* Geometry.c - holds trig/vector deliverance specific stuff for 3D */
/* Alex McLean, Pumpkin Studios, EIDOS Interactive */
-#include "Frame.h"
+#include "frame.h"
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -9,12 +9,12 @@
#include "ivisdef.h" //ivis matrix code
#include "geo.h" //ivis matrix code
-#include "ObjectDef.h"
-#include "Map.h"
-#include "Display3D.h"
-#include "Geometry.h"
-#include "GTime.h"
-#include "HCI.h"
+#include "objectdef.h"
+#include "map.h"
+#include "display3d.h"
+#include "geometry.h"
+#include "gtime.h"
+#include "hci.h"
#include "display.h"
Modified: trunk/src/group.c
===================================================================
--- trunk/src/group.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/group.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -5,11 +5,11 @@
*
*/
-#include "Frame.h"
-#include "Objects.h"
-#include "Group.h"
-#include "OrderDef.h"
-#include "multiPlay.h"
+#include "frame.h"
+#include "objects.h"
+#include "group.h"
+#include "orderdef.h"
+#include "multiplay.h"
// sizes for the group heap
#define GRP_HEAP_INIT 45
#define GRP_HEAP_EXT 15
Modified: trunk/src/group.h
===================================================================
--- trunk/src/group.h 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/group.h 2012-11-16 20:59:38 UTC (rev 40)
@@ -7,8 +7,8 @@
#ifndef _group_h
#define _group_h
-#include "Order.h"
-#include "OrderDef.h"
+#include "order.h"
+#include "orderdef.h"
typedef enum _group_type
{
Modified: trunk/src/hci.c
===================================================================
--- trunk/src/hci.c 2012-11-12 04:28:12 UTC (rev 39)
+++ trunk/src/hci.c 2012-11-16 20:59:38 UTC (rev 40)
@@ -11,32 +11,32 @@
//#define _DEBUG
-#include "Frame.h"
-#include "Widget.h"
+#include "frame.h"
+#include "widget.h"
-#include "Objects.h"
-#include "Loop.h"
-#include "Edit2D.h"
-#include "Map.h"
+#include "objects.h"
+#include "loop.h"
+#include "edit2d.h"
+#include "map.h"
/* Includes direct access to render library */
#include "piedef.h"
-#include "pieState.h"
+#include "piestate.h"
#include "vid.h"
-#include "Display3d.h"
-#include "Edit3D.h"
-#include "Disp2D.h"
-#include "Structure.h"
-#include "Research.h"
-#include "Function.h"
-#include "GTime.h"
-#include "HCI.h"
-#include "Stats.h"
+#include "display3d.h"
+#include "edit3d.h"
+#include "disp2d.h"
+#include "structure.h"
+#include "research.h"
+#include "function.h"
+#include "gtime.h"
+#include "hci.h"
+#include "stats.h"
#include "game.h"
#include "power.h"
#include "audio.h"
#include "audio_id.h"
-#include "WidgInt.h"
+#include "widgint.h"
#include "bar.h"
#include "form.h"
#include "label.h"
@@ -44,42 +44,42 @@
#include "editbox.h"
#include "slider.h"
#include "fractions.h"
-#include "Order.h"
-#include "Action.h"
-#include "IntImage.h"
-#include "IntDisplay.h"
-#include "Design.h"
-#include "IntelMap.h"
-#include "intOrder.h"
-#include "Radar.h"
-#include "MapDisplay.h"
-#include "Objects.h"
-#include "Display.h"
-#include "Text.h"
+#include "order.h"
+#include "action.h"
+#include "intimage.h"
+#include "intdisplay.h"
+#include "design.h"
+#include "intelmap.h"
+#include "intorder.h"
+#include "radar.h"
+#include "mapdisplay.h"
+#include "objects.h"
+#include "display.h"
+#include "text.h"
#include "deliverance.h"
-#include "WinMain.h"
+#include "winmain.h"
#include "mission.h"
-#include "CSnap.h" // cursor snapping
-#include "inGameOp.h" // ingame options screen.
-#include "Transporter.h"
-#include "WarCam.h"
-#include "Script.h"
-#include "ScriptTabs.h"
-#include "ScriptExtern.h"
-#include "ScriptCB.h"
-#include "Console.h"
+#in...
[truncated message content] |
|
From: <phe...@us...> - 2012-11-12 04:28:19
|
Revision: 39
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=39&view=rev
Author: pheonixstorm
Date: 2012-11-12 04:28:12 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
Removed unused files resource.c/.h They were renamed in retail but not removed.
Replaced uppercase header names with lowercase names to match current files.
Modified Paths:
--------------
trunk/lib/framework/Framework.vcxproj
trunk/lib/framework/Framework.vcxproj.filters
trunk/lib/framework/block.c
trunk/lib/framework/block.h
trunk/lib/framework/cursor.c
trunk/lib/framework/dxinput.c
trunk/lib/framework/dxinput.h
trunk/lib/framework/font.c
trunk/lib/framework/frame.c
trunk/lib/framework/frame.h
trunk/lib/framework/frameresource.c
trunk/lib/framework/heap.c
trunk/lib/framework/heap.h
trunk/lib/framework/image.c
trunk/lib/framework/input.c
trunk/lib/framework/mem.c
trunk/lib/framework/multiwdg.c
trunk/lib/framework/screen.c
trunk/lib/framework/strres.c
trunk/lib/framework/surface.c
trunk/lib/framework/treap.c
trunk/lib/framework/treap.h
trunk/lib/framework/trig.c
trunk/lib/framework/wdg.c
Removed Paths:
-------------
trunk/lib/framework/resource.c
trunk/lib/framework/resource.h
Modified: trunk/lib/framework/Framework.vcxproj
===================================================================
--- trunk/lib/framework/Framework.vcxproj 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/Framework.vcxproj 2012-11-12 04:28:12 UTC (rev 39)
@@ -363,7 +363,6 @@
<ClInclude Include="Mono.h" />
<ClInclude Include="multiWDG.h" />
<ClInclude Include="ResLY.h" />
- <ClInclude Include="Resource.h" />
<ClInclude Include="resource_y.h" />
<ClInclude Include="Screen.h" />
<ClInclude Include="StrRes.h" />
Modified: trunk/lib/framework/Framework.vcxproj.filters
===================================================================
--- trunk/lib/framework/Framework.vcxproj.filters 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/Framework.vcxproj.filters 2012-11-12 04:28:12 UTC (rev 39)
@@ -145,9 +145,6 @@
<ClInclude Include="ResLY.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="resource_y.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/lib/framework/block.c
===================================================================
--- trunk/lib/framework/block.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/block.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -16,15 +16,15 @@
#define DEBUG_GROUP0
#include "types.h"
-#include "Debug.h"
-#include "Mem.h"
-#include "Heap.h"
-#include "Treap.h"
-#include "TreapInt.h"
-#include "MemInt.h"
-#include "ListMacs.h"
+#include "debug.h"
+#include "mem.h"
+#include "heap.h"
+#include "treap.h"
+#include "treapint.h"
+#include "memint.h"
+#include "listmacs.h"
-#include "Block.h"
+#include "block.h"
/* What functions to use for the real malloc and free */
#define RMALLOC malloc
Modified: trunk/lib/framework/block.h
===================================================================
--- trunk/lib/framework/block.h 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/block.h 2012-11-12 04:28:12 UTC (rev 39)
@@ -8,8 +8,8 @@
#ifndef _block_h
#define _block_h
-#include "Mem.h"
-#include "MemInt.h"
+#include "mem.h"
+#include "memint.h"
// control whether the debugging block malloc is used
#if DEBUG_MALLOC
Modified: trunk/lib/framework/cursor.c
===================================================================
--- trunk/lib/framework/cursor.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/cursor.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -16,16 +16,16 @@
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
-#include "Types.h"
-#include "Debug.h"
-#include "Mem.h"
-#include "Surface.h"
-#include "Screen.h"
-#include "Input.h"
-#include "DDError.h"
-#include "DXInput.h"
-#include "FrameInt.h"
-#include "Cursor.h"
+#include "types.h"
+#include "debug.h"
+#include "mem.h"
+#include "surface.h"
+#include "screen.h"
+#include "input.h"
+#include "dderror.h"
+#include "dxinput.h"
+#include "frameint.h"
+#include "cursor.h"
// The size of the cursor save buffer
#define CURSOR_SAVEWIDTH 32
Modified: trunk/lib/framework/dxinput.c
===================================================================
--- trunk/lib/framework/dxinput.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/dxinput.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -5,9 +5,9 @@
*
*/
-#include "Frame.h"
-#include "FrameInt.h"
-#include "DXInput.h"
+#include "frame.h"
+#include "frameint.h"
+#include "dxinput.h"
// The direct input object
LPDIRECTINPUT psDI = NULL;
Modified: trunk/lib/framework/dxinput.h
===================================================================
--- trunk/lib/framework/dxinput.h 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/dxinput.h 2012-11-12 04:28:12 UTC (rev 39)
@@ -7,7 +7,7 @@
#ifndef _DXInput_h
#define _DXInput_h
-#define DIRECTINPUT_VERSION 0x0700
+//#define DIRECTINPUT_VERSION 0x0700
#include <dinput.h>
// The direct input object
Modified: trunk/lib/framework/font.c
===================================================================
--- trunk/lib/framework/font.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/font.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -7,8 +7,8 @@
#include <stdio.h>
-#include "Frame.h"
-#include "FrameInt.h"
+#include "frame.h"
+#include "frameint.h"
/* The header on a font file */
Modified: trunk/lib/framework/frame.c
===================================================================
--- trunk/lib/framework/frame.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/frame.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -274,7 +274,7 @@
// Copy the string.
strncpy(winErrorString, lpMsgBuf, 254);
- winErrorString[255] = '0';
+ winErrorString[255] = '\0';
// Free the buffer.
LocalFree( lpMsgBuf );
Modified: trunk/lib/framework/frame.h
===================================================================
--- trunk/lib/framework/frame.h 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/frame.h 2012-11-12 04:28:12 UTC (rev 39)
@@ -19,18 +19,18 @@
#include "dderror.h"
#include "input.h"
#include "surface.h"
-#include "Image.h"
-#include "Font.h"
-#include "Heap.h"
-#include "Treap.h"
+#include "image.h"
+#include "font.h"
+#include "heap.h"
+#include "treap.h"
#include "w95trace.h"
-#include "Fractions.h"
-#include "Trig.h"
-#include "FrameResource.h"
-#include "StrRes.h"
-#include "DXInput.h"
-#include "Block.h"
-#include "ListMacs.h"
+#include "fractions.h"
+#include "trig.h"
+#include "frameresource.h"
+#include "strres.h"
+#include "dxinput.h"
+#include "block.h"
+#include "listmacs.h"
/* Initialise the frame work library */
extern BOOL frameInitialise(HANDLE hInstance, // The windows application instance
Modified: trunk/lib/framework/frameresource.c
===================================================================
--- trunk/lib/framework/frameresource.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/frameresource.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -8,9 +8,9 @@
#include <string.h>
#include <stdio.h>
#include <assert.h>
-#include "Frame.h"
-#include "FrameResource.h"
-#include "ResLY.h"
+#include "frame.h"
+#include "frameresource.h"
+#include "resly.h"
#include "wdg.h"
#include "multiwdg.h"
Modified: trunk/lib/framework/heap.c
===================================================================
--- trunk/lib/framework/heap.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/heap.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -12,13 +12,13 @@
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
-#include "Types.h"
-#include "Debug.h"
-#include "Mem.h"
-#include "Heap.h"
-#include "Treap.h"
-#include "TreapInt.h"
-#include "Block.h"
+#include "types.h"
+#include "debug.h"
+#include "mem.h"
+#include "heap.h"
+#include "treap.h"
+#include "treapint.h"
+#include "block.h"
// Control whether a heap usage report is printed out when a heap is destroyed
#define HEAP_USAGE_REPORT FALSE
Modified: trunk/lib/framework/heap.h
===================================================================
--- trunk/lib/framework/heap.h 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/heap.h 2012-11-12 04:28:12 UTC (rev 39)
@@ -11,12 +11,12 @@
#ifndef _heap_h
#define _heap_h
-#include "Types.h"
-#include "Debug.h"
+#include "types.h"
+#include "debug.h"
/* Include Mem.h to get the DEBUG_MALLOC #define - this controls whether
* normal or debugging memory management is used.
*/
-#include "Mem.h"
+#include "mem.h"
/* structure used to store the list of free heap objects */
typedef struct _free_object
Modified: trunk/lib/framework/image.c
===================================================================
--- trunk/lib/framework/image.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/image.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -15,10 +15,10 @@
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
-#include "Types.h"
-#include "Debug.h"
-#include "Mem.h"
-#include "Image.h"
+#include "types.h"
+#include "debug.h"
+#include "mem.h"
+#include "image.h"
// Define this if you want to generate pictures (for tools ?)
#define WRITEIMAGES
Modified: trunk/lib/framework/input.c
===================================================================
--- trunk/lib/framework/input.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/input.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -19,13 +19,13 @@
/* The input buffer printf's */
//#define DEBUG_GROUP1
-#include "Types.h"
-#include "Debug.h"
-#include "Input.h"
-#include "Screen.h"
+#include "types.h"
+#include "debug.h"
+#include "input.h"
+#include "screen.h"
#include "frameint.h"
-#include "Fractions.h"
-#include "Frame.h"
+#include "fractions.h"
+#include "frame.h"
/* The possible states for keys */
typedef enum _key_state
@@ -44,6 +44,7 @@
static KEY_STATE aKeyState[KEY_MAXSCAN];
/* Mouse wheel stuff */
+// static SDWORD wheelVal; // ADD FIXME Use this val when mouse rotate function found
static UDWORD oldWheelPos = 0;
static BOOL bMouseWheelForward = FALSE;
static BOOL bMouseWheelBackwards = FALSE;
@@ -243,7 +244,7 @@
}
break;
- /* FIXME
+ /* FIXME Can be enabled soon I hope.
case WM_MOUSEWHEEL: // not defined in non-NT.....bugger.
wheelVal = HIWORD(wParam);
if(wheelVal<0)
Modified: trunk/lib/framework/mem.c
===================================================================
--- trunk/lib/framework/mem.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/mem.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -16,11 +16,11 @@
#include "types.h"
#include "mem.h"
#include "debug.h"
-#include "Heap.h"
-#include "Treap.h"
-#include "TreapInt.h"
-#include "MemInt.h"
-#include "Block.h"
+#include "heap.h"
+#include "treap.h"
+#include "treapint.h"
+#include "memint.h"
+#include "block.h"
#include <assert.h>
Modified: trunk/lib/framework/multiwdg.c
===================================================================
--- trunk/lib/framework/multiwdg.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/multiwdg.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -5,9 +5,9 @@
*
*/
-#include "Frame.h"
+#include "frame.h"
#include "wdg.h"
-#include "multiWDG.h"
+#include "multiwdg.h"
// the list of file catalogs for all the current WDGs
WDGCACHE *psWDGCache;
Deleted: trunk/lib/framework/resource.c
===================================================================
--- trunk/lib/framework/resource.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/resource.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -1,13 +0,0 @@
-
-
-#error This file (framework/resource.c) should now be removed from the projects & replaced with framework/FrameResource.c
-
-
-
-/*
-
- This file has been renamed to avoid a filename clash with resource.c/.h in the main warzone directory
-
- - TJC 8-Oct-97
-
-*/
\ No newline at end of file
Deleted: trunk/lib/framework/resource.h
===================================================================
--- trunk/lib/framework/resource.h 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/resource.h 2012-11-12 04:28:12 UTC (rev 39)
@@ -1,12 +0,0 @@
-
-
-#error This file should now be replaced with FrameResource.h
-
-
-
-/*
-
- This file has been renamed to avoid a filename clash with resource.c/.h in the main warzone directory
-
-
-*/
\ No newline at end of file
Modified: trunk/lib/framework/screen.c
===================================================================
--- trunk/lib/framework/screen.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/screen.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -14,8 +14,8 @@
#include <ddraw.h>
#pragma warning (default : 4201 4214 4115)
-#include "Frame.h"
-#include "Frameint.h"
+#include "frame.h"
+#include "frameint.h"
/* Control Whether the back buffer is in system memory for full screen */
#define FULL_SCREEN_SYSTEM TRUE
Modified: trunk/lib/framework/strres.c
===================================================================
--- trunk/lib/framework/strres.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/strres.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -12,13 +12,13 @@
// Report unused strings
//#define DEBUG_GROUP0
-#include "Types.h"
-#include "Debug.h"
-#include "Mem.h"
+#include "types.h"
+#include "debug.h"
+#include "mem.h"
#include "heap.h"
-#include "Treap.h"
-#include "StrRes.h"
-#include "StrResLY.h"
+#include "treap.h"
+#include "strres.h"
+#include "strresly.h"
/* The string resource currently being loaded */
STR_RES *psCurrRes;
Modified: trunk/lib/framework/surface.c
===================================================================
--- trunk/lib/framework/surface.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/surface.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -7,8 +7,8 @@
// surfRecreate pix format stuff
//#define DEBUG_GROUP1
-#include "Frame.h"
-#include "FrameInt.h"
+#include "frame.h"
+#include "frameint.h"
#define NUM_8BIT_PAL_ENTRIES 256
Modified: trunk/lib/framework/treap.c
===================================================================
--- trunk/lib/framework/treap.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/treap.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -10,11 +10,11 @@
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE
-#include "Types.h"
-#include "Debug.h"
-#include "Mem.h"
-#include "Heap.h"
-#include "Treap.h"
+#include "types.h"
+#include "debug.h"
+#include "mem.h"
+#include "heap.h"
+#include "treap.h"
/* Position of the last call */
static SDWORD cLine;
Modified: trunk/lib/framework/treap.h
===================================================================
--- trunk/lib/framework/treap.h 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/treap.h 2012-11-12 04:28:12 UTC (rev 39)
@@ -12,10 +12,10 @@
#ifndef _treap_h
#define _treap_h
-#include "Types.h"
-#include "Debug.h"
-#include "Mem.h"
-#include "Heap.h"
+#include "types.h"
+#include "debug.h"
+#include "mem.h"
+#include "heap.h"
/* Turn on and off the treap debugging */
#ifdef DEBUG
Modified: trunk/lib/framework/trig.c
===================================================================
--- trunk/lib/framework/trig.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/trig.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -9,11 +9,11 @@
#define FRAME_LIB_INCLUDE
#include <assert.h>
-#include "Types.h"
-#include "Debug.h"
-#include "Mem.h"
-#include "Fractions.h"
-#include "Trig.h"
+#include "types.h"
+#include "debug.h"
+#include "mem.h"
+#include "fractions.h"
+#include "trig.h"
#define PI 3.141592654
Modified: trunk/lib/framework/wdg.c
===================================================================
--- trunk/lib/framework/wdg.c 2012-11-12 04:22:31 UTC (rev 38)
+++ trunk/lib/framework/wdg.c 2012-11-12 04:28:12 UTC (rev 39)
@@ -12,9 +12,9 @@
#include <assert.h>
-#include "Frame.h"
+#include "frame.h"
#include "wdg.h"
-#include "MultiWDG.h"
+#include "multiwdg.h"
/** local definitions **/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-12 04:22:37
|
Revision: 38
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=38&view=rev
Author: pheonixstorm
Date: 2012-11-12 04:22:31 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
Replaced uppercase header names with lowercase names to match current files
Modified Paths:
--------------
trunk/lib/gamelib/gtime.c
Modified: trunk/lib/gamelib/gtime.c
===================================================================
--- trunk/lib/gamelib/gtime.c 2012-11-12 03:56:59 UTC (rev 37)
+++ trunk/lib/gamelib/gtime.c 2012-11-12 04:22:31 UTC (rev 38)
@@ -8,8 +8,8 @@
#include <time.h>
//#define DEBUG_GROUP1
-#include "Frame.h"
-#include "GTime.h"
+#include "frame.h"
+#include "gtime.h"
#define TIME_FIX
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-12 03:57:06
|
Revision: 37
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=37&view=rev
Author: pheonixstorm
Date: 2012-11-12 03:56:59 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
Replaced uppercase header names with lowercase names to match current files
Modified Paths:
--------------
trunk/lib/ivis02/3dfxdyn.c
trunk/lib/ivis02/3dfxfunc.c
trunk/lib/ivis02/3dfxmode.c
trunk/lib/ivis02/3dfxtext.c
trunk/lib/ivis02/bitimage.c
trunk/lib/ivis02/bspfunc.h
trunk/lib/ivis02/bspimd.c
trunk/lib/ivis02/d3dmode.c
trunk/lib/ivis02/d3drender.c
trunk/lib/ivis02/d3drender.h
trunk/lib/ivis02/dx6texman.c
trunk/lib/ivis02/geo.h
trunk/lib/ivis02/imd.c
trunk/lib/ivis02/imdload.c
trunk/lib/ivis02/ivi.c
trunk/lib/ivis02/ivisdef.h
trunk/lib/ivis02/ivispatch.h
trunk/lib/ivis02/pcx.c
trunk/lib/ivis02/pieblitfunc.c
trunk/lib/ivis02/pieclip.c
trunk/lib/ivis02/piedraw.c
trunk/lib/ivis02/piefunc.c
trunk/lib/ivis02/piematrix.c
trunk/lib/ivis02/piematrix.h
trunk/lib/ivis02/piemode.c
trunk/lib/ivis02/piepalette.c
trunk/lib/ivis02/piestate.c
trunk/lib/ivis02/pietexture.c
trunk/lib/ivis02/rendfunc.c
trunk/lib/ivis02/rendmode.c
trunk/lib/ivis02/rendmode.h
trunk/lib/ivis02/tex.c
trunk/lib/ivis02/textdraw.c
trunk/lib/ivis02/v4101.c
Modified: trunk/lib/ivis02/3dfxdyn.c
===================================================================
--- trunk/lib/ivis02/3dfxdyn.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/3dfxdyn.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -10,7 +10,7 @@
#define dllName "glide2x.dll"
-#include "Dglide.h" // new glide.h - old glide.h MUST be renamed glideold.h!
+#include "dglide.h" // new glide.h - old glide.h MUST be renamed glideold.h!
Modified: trunk/lib/ivis02/3dfxfunc.c
===================================================================
--- trunk/lib/ivis02/3dfxfunc.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/3dfxfunc.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -1,21 +1,21 @@
#ifdef INC_GLIDE
#include "ivi.h"
-#include "piePalette.h"
-#include "pieState.h"
-#include "pieTexture.h"
-#include "Frame.h"
-#include "BitImage.h"
+#include "piepalette.h"
+#include "piestate.h"
+#include "pietexture.h"
+#include "frame.h"
+#include "bitimage.h"
#include "3dfxfunc.h"
#include "3dfxmode.h"
-#include "3dfxText.h"
+#include "3dfxtext.h"
#include "stdio.h"
#include "string.h"
#include "assert.h"
-#include "dGlide.h"
+#include "dglide.h"
#include "imd.h"
#include "rendmode.h"
-#include "PieClip.h"
-#include "pieMatrix.h"
+#include "Pieclip.h"
+#include "piematrix.h"
#define SNAP_BIAS ((float)0.0)
//#define SNAP_BIAS ((float)(3<<18))
Modified: trunk/lib/ivis02/3dfxmode.c
===================================================================
--- trunk/lib/ivis02/3dfxmode.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/3dfxmode.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -7,13 +7,13 @@
*/
-#include "dGlide.h"
-#include "Frame.h"
-#include "3dfxText.h"
+#include "dglide.h"
+#include "frame.h"
+#include "3dfxtext.h"
#include "3dfxmode.h"
#include "rendmode.h"
-#include "pieState.h"
-#include "pieClip.h"
+#include "piestate.h"
+#include "pieclip.h"
GrScreenResolution_t getGlideResDescriptor( UDWORD resWidth );
#define MAX_3DFX_WIDTH 800
Modified: trunk/lib/ivis02/3dfxtext.c
===================================================================
--- trunk/lib/ivis02/3dfxtext.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/3dfxtext.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -4,12 +4,12 @@
/* Texture Handling Functions for a 3dfx card */
/* Alex McLean, Pumpkin Studios, 1997 */
-#include "Frame.h"
+#include "frame.h"
#include "stdlib.h"
-#include "dGlide.h"
+#include "dglide.h"
#include "stdio.h"
-#include "3dfxText.h"
-#include "pieState.h"
+#include "3dfxtext.h"
+#include "piestate.h"
#include "bug.h"
#include "tex.h"
Modified: trunk/lib/ivis02/bitimage.c
===================================================================
--- trunk/lib/ivis02/bitimage.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/bitimage.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -4,7 +4,7 @@
#include <dos.h>
#include "rendmode.h"
#include "bug.h"
-#include "piePalette.h"
+#include "piepalette.h"
#include "pcx.h"
#include "tex.h"
#include "ivispatch.h"
@@ -15,7 +15,7 @@
#include "3dfxfunc.h"
#endif
-#include "BitImage.h"
+#include "bitimage.h"
static BOOL LoadTextureFile(char *FileName,iSprite *TPage,int *TPageID);
Modified: trunk/lib/ivis02/bspfunc.h
===================================================================
--- trunk/lib/ivis02/bspfunc.h 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/bspfunc.h 2012-11-12 03:56:59 UTC (rev 37)
@@ -2,7 +2,7 @@
#define _bspfunc_h_
#include "ivisdef.h"
-#include "bspImd.h"
+#include "bspimd.h"
/***************************************************************************/
Modified: trunk/lib/ivis02/bspimd.c
===================================================================
--- trunk/lib/ivis02/bspimd.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/bspimd.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -3,17 +3,15 @@
BSP Draw routines for iVis02
- 5 Sept 1997 - Tim Cannell - Pumpkin Studios - Eidos
-
-
-
+
- Main routines were written by Gareth Jones .... so if you find any bugs I think you better speak to him ...
*/
#include "frame.h" // just for the typedef's
-#include "pieTypes.h"
-#include "pieMatrix.h"
+#include "pietypes.h"
+#include "piematrix.h"
#include "ivisdef.h"// this can have the #define for BSPIMD in it
#include "imd.h"// this has the #define for BSPPOLYID_TERMINATE
#include "ivi.h"
Modified: trunk/lib/ivis02/d3dmode.c
===================================================================
--- trunk/lib/ivis02/d3dmode.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/d3dmode.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -3,10 +3,10 @@
#include "d3d.h"
//#include "ivi.h"
-#include "rendMode.h"
-#include "pieClip.h"
+#include "rendmode.h"
+#include "pieclip.h"
#include "d3drender.h"
-#include "dx6TexMan.h"
+#include "dx6texman.h"
/***************************************************************************/
Modified: trunk/lib/ivis02/d3drender.c
===================================================================
--- trunk/lib/ivis02/d3drender.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/d3drender.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -5,14 +5,14 @@
#include "ivi.h"
#include "rendmode.h"
#include "tex.h"
-#include "piePalette.h"
-#include "pieState.h"
-#include "pieClip.h"
+#include "piepalette.h"
+#include "piestate.h"
+#include "pieclip.h"
#include "frameint.h"
#include "d3drender.h"
#include "texd3d.h"
-#include "dx6TexMan.h"
+#include "dx6texman.h"
/***************************************************************************/
Modified: trunk/lib/ivis02/d3drender.h
===================================================================
--- trunk/lib/ivis02/d3drender.h 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/d3drender.h 2012-11-12 03:56:59 UTC (rev 37)
@@ -9,7 +9,7 @@
#include "d3d.h"
#include "frame.h"
#include "texd3d.h"
-#include "pieState.h"
+#include "piestate.h"
/***************************************************************************/
Modified: trunk/lib/ivis02/dx6texman.c
===================================================================
--- trunk/lib/ivis02/dx6texman.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/dx6texman.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -9,10 +9,10 @@
#include "frame.h"
#include "piedef.h"
-#include "pieState.h"
-#include "piePalette.h"
-#include "d3dRender.h"
-#include "dx6TexMan.h"
+#include "piestate.h"
+#include "piepalette.h"
+#include "d3drender.h"
+#include "dx6texman.h"
#include "tex.h"
Modified: trunk/lib/ivis02/geo.h
===================================================================
--- trunk/lib/ivis02/geo.h 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/geo.h 2012-11-12 03:56:59 UTC (rev 37)
@@ -1,6 +1,6 @@
#ifndef _geo_
#define _geo_
-#include "pieMatrix.h"
+#include "piematrix.h"
#endif
Modified: trunk/lib/ivis02/imd.c
===================================================================
--- trunk/lib/ivis02/imd.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/imd.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -11,16 +11,11 @@
//#define PIETOOL
-
-
-
#ifdef PIETOOL
#define BSPIMD
#define SAVEIMD
#endif
-
-
#include "ivisdef.h"
#include "imd.h"
//#include "geo.h"
Modified: trunk/lib/ivis02/imdload.c
===================================================================
--- trunk/lib/ivis02/imdload.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/imdload.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -15,7 +15,7 @@
#include <stdio.h>
#include "frame.h"
-#include "pieMatrix.h" //for surface normals
+#include "piematrix.h" //for surface normals
#include "ivisdef.h" // for imd structures
#include "imd.h" // for imd structures
#include "rendmode.h"
Modified: trunk/lib/ivis02/ivi.c
===================================================================
--- trunk/lib/ivis02/ivi.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/ivi.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -3,16 +3,16 @@
#include <stdarg.h>
#include <time.h>
#include "ivisdef.h"
-#include "pieState.h"
+#include "piestate.h"
//#include "ivi.h"
//#include "v3d.h"
#include "rendmode.h"
-#include "pieMode.h"
+#include "piemode.h"
//#include "geo.h"
#include "bug.h"
//#include "pio.h"
-#include "piePalette.h"
-#include "pieMatrix.h"
+#include "piepalette.h"
+#include "piematrix.h"
//#include "kyb.h"
#include "tex.h"
//#include "pdv.h"
Modified: trunk/lib/ivis02/ivisdef.h
===================================================================
--- trunk/lib/ivis02/ivisdef.h 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/ivisdef.h 2012-11-12 03:56:59 UTC (rev 37)
@@ -11,7 +11,7 @@
#define _ivisdef_h
#include "frame.h"
-#include "pieTypes.h"
+#include "pietypes.h"
/***************************************************************************/
/***************************************************************************/
Modified: trunk/lib/ivis02/ivispatch.h
===================================================================
--- trunk/lib/ivis02/ivispatch.h 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/ivispatch.h 2012-11-12 03:56:59 UTC (rev 37)
@@ -11,7 +11,7 @@
#define _ivispatch_h
#include "frame.h"
-#include "pieTypes.h"
+#include "pietypes.h"
/***************************************************************************/
/***************************************************************************/
Modified: trunk/lib/ivis02/pcx.c
===================================================================
--- trunk/lib/ivis02/pcx.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/pcx.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -9,7 +9,7 @@
//#include <stdio.h>
//#include <stdlib.h>
//#include <io.h>
-//#include "pcx.h"
+#include "pcx.h"
//#include "pal.h"
//#include "bug.h"
//#include "ivisheap.h"
Modified: trunk/lib/ivis02/pieblitfunc.c
===================================================================
--- trunk/lib/ivis02/pieblitfunc.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/pieblitfunc.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -7,22 +7,23 @@
*/
/***************************************************************************/
+#include <time.h>
+
#include "frame.h"
-#include <time.h>
-#include "pieBlitFunc.h"
-#include "dx6TexMan.h"
+#include "pieblitfunc.h"
+#include "dx6texman.h"
#include "bug.h"
#include "piedef.h"
-#include "pieMode.h"
-#include "pieState.h"
-#include "3dfxFunc.h"
-#include "rendFunc.h"
-#include "rendMode.h"
+#include "piemode.h"
+#include "piestate.h"
+#include "3dfxfunc.h"
+#include "rendfunc.h"
+#include "rendmode.h"
#include "texd3d.h"
#include "pcx.h"
-#include "pieClip.h"
-#include "pieFunc.h"
-#include "pieMatrix.h"
+#include "pieclip.h"
+#include "piefunc.h"
+#include "piematrix.h"
/***************************************************************************/
/*
Modified: trunk/lib/ivis02/pieclip.c
===================================================================
--- trunk/lib/ivis02/pieclip.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/pieclip.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -7,10 +7,10 @@
*/
/***************************************************************************/
-#include "pieClip.h"
+#include "pieclip.h"
#include "frame.h"
-#include "pieDef.h"
-#include "pieState.h"
+#include "piedef.h"
+#include "piestate.h"
#include "rendmode.h"
#include "d3drender.h"
#ifdef INC_GLIDE
Modified: trunk/lib/ivis02/piedraw.c
===================================================================
--- trunk/lib/ivis02/piedraw.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/piedraw.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -14,14 +14,14 @@
#include "imd.h"
#include "rendmode.h"
//#include "d3dmode.h"
-#include "pieFunc.h"
-#include "pieMatrix.h"
+#include "piefunc.h"
+#include "piematrix.h"
#include "tex.h"
#include "piedef.h"
-#include "pieState.h"
-#include "pieTexture.h"
-#include "pieClip.h"
+#include "piestate.h"
+#include "pietexture.h"
+#include "pieclip.h"
#include "d3d.h"
#include "d3drender.h"
Modified: trunk/lib/ivis02/piefunc.c
===================================================================
--- trunk/lib/ivis02/piefunc.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/piefunc.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -10,12 +10,12 @@
#include "frame.h"
#include "piedef.h"
-#include "rendMode.h"
-#include "pieFunc.h"
-#include "pieState.h"
-#include "pieMatrix.h"
-#include "pieTexture.h"
-#include "pieClip.h"
+#include "rendmode.h"
+#include "piefunc.h"
+#include "piestate.h"
+#include "piematrix.h"
+#include "pietexture.h"
+#include "pieclip.h"
#include "d3d.h"
#include "d3drender.h"
Modified: trunk/lib/ivis02/piematrix.c
===================================================================
--- trunk/lib/ivis02/piematrix.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/piematrix.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -11,8 +11,8 @@
#include "piedef.h"
-#include "pieMatrix.h"
-#include "rendMode.h"
+#include "piematrix.h"
+#include "rendmode.h"
#include "bug.h"
/***************************************************************************/
Modified: trunk/lib/ivis02/piematrix.h
===================================================================
--- trunk/lib/ivis02/piematrix.h 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/piematrix.h 2012-11-12 03:56:59 UTC (rev 37)
@@ -9,7 +9,7 @@
#ifndef _pieMatrix_h
#define _pieMatrix_h
-#include "pieDef.h"
+#include "piedef.h"
/***************************************************************************/
/*
Modified: trunk/lib/ivis02/piemode.c
===================================================================
--- trunk/lib/ivis02/piemode.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/piemode.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -9,18 +9,18 @@
#include "frame.h"
#include "piedef.h"
-#include "pieState.h"
-#include "pieMode.h"
-#include "pieMatrix.h"
-#include "pieFunc.h"
+#include "piestate.h"
+#include "piemode.h"
+#include "piematrix.h"
+#include "piefunc.h"
#include "tex.h"
#include "d3dmode.h"
#include "v4101.h"
-#include "vSR.h"
-#include "3dfxFunc.h"
+#include "vsr.h"
+#include "3dfxfunc.h"
#include "texd3d.h"
#include "rendmode.h"
-#include "Pieclip.h"
+#include "pieclip.h"
/***************************************************************************/
/*
Modified: trunk/lib/ivis02/piepalette.c
===================================================================
--- trunk/lib/ivis02/piepalette.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/piepalette.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -1,8 +1,8 @@
#include <stdio.h>
#include <math.h>
#include "ivi.h"
-#include "pieState.h"
-#include "piePalette.h"
+#include "piestate.h"
+#include "piepalette.h"
#include "rendmode.h"
#include "bug.h"
#include "fractions.h"
Modified: trunk/lib/ivis02/piestate.c
===================================================================
--- trunk/lib/ivis02/piestate.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/piestate.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -8,10 +8,10 @@
/***************************************************************************/
#include "frame.h"
-#include "pieState.h"
+#include "piestate.h"
#include "piedef.h"
-#include "d3dRender.h"
-#include "dx6TexMan.h"
+#include "d3drender.h"
+#include "dx6texman.h"
#include "tex.h"
#include "texd3d.h"
#ifdef INC_GLIDE
Modified: trunk/lib/ivis02/pietexture.c
===================================================================
--- trunk/lib/ivis02/pietexture.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/pietexture.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -8,10 +8,10 @@
/***************************************************************************/
#include "frame.h"
-#include "pieTexture.h"
+#include "pietexture.h"
#include "piedef.h"
-#include "pieState.h"
-#include "dx6TexMan.h"
+#include "piestate.h"
+#include "dx6texman.h"
#include "tex.h"
#ifdef INC_GLIDE
#include "3dfxText.h"
Modified: trunk/lib/ivis02/rendfunc.c
===================================================================
--- trunk/lib/ivis02/rendfunc.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/rendfunc.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -5,10 +5,10 @@
#include "rendfunc.h"
#include "rendmode.h"
#include "bug.h"
-#include "piePalette.h"
+#include "piepalette.h"
#include "ivispatch.h"
#include "fractions.h"
-#include "pieClip.h"
+#include "pieclip.h"
// #ifndef PIETOOL
Modified: trunk/lib/ivis02/rendmode.c
===================================================================
--- trunk/lib/ivis02/rendmode.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/rendmode.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -3,18 +3,18 @@
#include <math.h>
#include <dos.h>
#include "rendmode.h"
-#include "pieClip.h"
+#include "pieclip.h"
#include "d3dmode.h"
#include "v4101.h"
-#include "rendFunc.h"
+#include "rendfunc.h"
#include "vsr.h"
//#include "3dfxfunc.h"
//#include "rendFunc.h"
-#include "textDraw.h"
+#include "textdraw.h"
#include "bug.h"
-#include "piePalette.h"
-#include "pieState.h"
+#include "piepalette.h"
+#include "piestate.h"
#include "ivispatch.h"
#include "fractions.h"
Modified: trunk/lib/ivis02/rendmode.h
===================================================================
--- trunk/lib/ivis02/rendmode.h 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/rendmode.h 2012-11-12 03:56:59 UTC (rev 37)
@@ -4,9 +4,9 @@
#include "ivisdef.h"
#include "v4101.h"
#include "vsr.h"
-#include "pieBlitFunc.h"
-#include "BitImage.h"
-#include "TextDraw.h"
+#include "pieblitfunc.h"
+#include "bitimage.h"
+#include "textdraw.h"
//*************************************************************************
//patch
Modified: trunk/lib/ivis02/tex.c
===================================================================
--- trunk/lib/ivis02/tex.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/tex.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -6,16 +6,16 @@
#include <ctype.h>
#include "frame.h"
#include "ivisdef.h"
-#include "pieState.h"
-#include "dx6TexMan.h"
+#include "piestate.h"
+#include "dx6texman.h"
#include "tex.h"
#include "rendmode.h"
#include "pcx.h"
-#include "piePalette.h"
+#include "piepalette.h"
#include "bug.h"
#include "ivispatch.h"
#ifdef INC_GLIDE
-#include "3dfxText.h"
+#include "3dfxtext.h"
#endif
#include "d3drender.h"
Modified: trunk/lib/ivis02/textdraw.c
===================================================================
--- trunk/lib/ivis02/textdraw.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/textdraw.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -4,17 +4,17 @@
#include <dos.h>
#include <ddraw.h>
#include "ivisdef.h"
-#include "pieState.h"
+#include "piestate.h"
#include "rendmode.h"
#include "rendfunc.h"
-#include "pieClip.h"
-#include "pieBlitFunc.h"
+#include "pieclip.h"
+#include "pieblitfunc.h"
#include "bug.h"
-#include "piePalette.h"
+#include "piepalette.h"
#include "ivispatch.h"
-#include "TextDraw.h"
-#include "BitImage.h"
+#include "textdraw.h"
+#include "bitimage.h"
extern void pie_DrawTextNew(unsigned char *string, int x, int y);
extern SDWORD DisplayXFactor;
Modified: trunk/lib/ivis02/v4101.c
===================================================================
--- trunk/lib/ivis02/v4101.c 2012-11-12 03:51:44 UTC (rev 36)
+++ trunk/lib/ivis02/v4101.c 2012-11-12 03:56:59 UTC (rev 37)
@@ -11,9 +11,9 @@
#include "rendmode.h"
#include "piemode.h"
#include "bug.h"
-#include "piePalette.h"
-#include "pieMatrix.h" // clockwise check
-#include "pieClip.h"
+#include "piepalette.h"
+#include "piematrix.h" // clockwise check
+#include "pieclip.h"
#ifdef iV_DDX
#include <Wtypes.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-12 03:51:51
|
Revision: 36
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=36&view=rev
Author: pheonixstorm
Date: 2012-11-12 03:51:44 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
Replaced uppercase header names with lowercase names to match current files
Modified Paths:
--------------
trunk/lib/netplay/netlobby.c
Modified: trunk/lib/netplay/netlobby.c
===================================================================
--- trunk/lib/netplay/netlobby.c 2012-11-10 22:09:33 UTC (rev 35)
+++ trunk/lib/netplay/netlobby.c 2012-11-12 03:51:44 UTC (rev 36)
@@ -8,7 +8,7 @@
#include <windowsx.h>
#include "frame.h" // for dbprintf
-#include "Netplay.h"
+#include "netplay.h"
//#include "netlobby.h"
// note registry entries should be set by the installation routine.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-10 22:09:41
|
Revision: 35
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=35&view=rev
Author: pheonixstorm
Date: 2012-11-10 22:09:33 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Replaced uppercase header names with lowercase names to match current files
Modified Paths:
--------------
trunk/lib/script/codeprint.c
trunk/lib/script/event.c
trunk/lib/script/evntsave.c
trunk/lib/script/interp.c
trunk/lib/script/script.c
trunk/lib/script/script.h
trunk/lib/script/script_y.c
trunk/lib/script/stack.c
Modified: trunk/lib/script/codeprint.c
===================================================================
--- trunk/lib/script/codeprint.c 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/codeprint.c 2012-11-10 22:09:33 UTC (rev 35)
@@ -5,11 +5,11 @@
* Routines for displaying compiled scripts
*/
-#include "Frame.h"
-#include "Interp.h"
-#include "Parse.h"
-#include "CodePrint.h"
-#include "Script.h"
+#include "frame.h"
+#include "interp.h"
+#include "parse.h"
+#include "codeprint.h"
+#include "script.h"
/* Display a value type */
void cpPrintType(INTERP_TYPE type)
Modified: trunk/lib/script/event.c
===================================================================
--- trunk/lib/script/event.c 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/event.c 2012-11-10 22:09:33 UTC (rev 35)
@@ -10,10 +10,10 @@
#define DEBUG_GROUP0
// display tested triggers
//#define DEBUG_GROUP1
-#include "Frame.h"
-#include "Interp.h"
-#include "Script.h"
-#include "Event.h"
+#include "frame.h"
+#include "interp.h"
+#include "script.h"
+#include "event.h"
// array to store release functions
static VAL_CREATE_FUNC *asCreateFuncs;
Modified: trunk/lib/script/evntsave.c
===================================================================
--- trunk/lib/script/evntsave.c 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/evntsave.c 2012-11-10 22:09:33 UTC (rev 35)
@@ -5,9 +5,9 @@
*
*/
-#include "Frame.h"
-#include "Script.h"
-#include "EvntSave.h"
+#include "frame.h"
+#include "script.h"
+#include "evntsave.h"
// the event save file header
Modified: trunk/lib/script/interp.c
===================================================================
--- trunk/lib/script/interp.c 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/interp.c 2012-11-10 22:09:33 UTC (rev 35)
@@ -7,11 +7,11 @@
/* Control the execution trace printf's */
#define DEBUG_GROUP0
-#include "Frame.h"
-#include "Interp.h"
-#include "Stack.h"
-#include "CodePrint.h"
-#include "Script.h"
+#include "frame.h"
+#include "interp.h"
+#include "stack.h"
+#include "codeprint.h"
+#include "script.h"
// the maximum number of instructions to execute before assuming
Modified: trunk/lib/script/script.c
===================================================================
--- trunk/lib/script/script.c 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/script.c 2012-11-10 22:09:33 UTC (rev 35)
@@ -4,8 +4,8 @@
* A few general functions for the script library
*/
-#include "Frame.h"
-#include "Script.h"
+#include "frame.h"
+#include "script.h"
#include <assert.h>
Modified: trunk/lib/script/script.h
===================================================================
--- trunk/lib/script/script.h 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/script.h 2012-11-10 22:09:33 UTC (rev 35)
@@ -6,12 +6,12 @@
#ifndef _script_h
#define _script_h
-#include "Interp.h"
-#include "Stack.h"
-#include "CodePrint.h"
-#include "Parse.h"
-#include "Event.h"
-#include "EvntSave.h"
+#include "interp.h"
+#include "stack.h"
+#include "codeprint.h"
+#include "parse.h"
+#include "event.h"
+#include "evntsave.h"
/* Whether to include debug info when compiling */
Modified: trunk/lib/script/script_y.c
===================================================================
--- trunk/lib/script/script_y.c 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/script_y.c 2012-11-10 22:09:33 UTC (rev 35)
@@ -60,10 +60,10 @@
#include <limits.h>
#include <stdio.h>
-#include "Frame.h"
-#include "Interp.h"
-#include "Parse.h"
-#include "Script.h"
+#include "frame.h"
+#include "interp.h"
+#include "parse.h"
+#include "script.h"
/* Error return codes for code generation functions */
typedef enum _code_error
Modified: trunk/lib/script/stack.c
===================================================================
--- trunk/lib/script/stack.c 2012-11-10 22:03:49 UTC (rev 34)
+++ trunk/lib/script/stack.c 2012-11-10 22:09:33 UTC (rev 35)
@@ -6,11 +6,11 @@
#include <stdarg.h>
-#include "Frame.h"
-#include "Interp.h"
-#include "Stack.h"
-#include "CodePrint.h"
-#include "Script.h"
+#include "frame.h"
+#include "interp.h"
+#include "stack.h"
+#include "codeprint.h"
+#include "script.h"
/* number of values in each stack chunk */
#define INIT_SIZE 15
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-10 22:03:55
|
Revision: 34
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=34&view=rev
Author: pheonixstorm
Date: 2012-11-10 22:03:49 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Replaced uppercase header names with lowercase names to match current files
Modified Paths:
--------------
trunk/lib/sound/track.c
Modified: trunk/lib/sound/track.c
===================================================================
--- trunk/lib/sound/track.c 2012-11-10 22:02:17 UTC (rev 33)
+++ trunk/lib/sound/track.c 2012-11-10 22:03:49 UTC (rev 34)
@@ -4,7 +4,7 @@
#include <windows.h>
#pragma warning (default : 4201 4214 4115)
-#include "Frame.h"
+#include "frame.h"
#include "tracklib.h"
#include "priority.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phe...@us...> - 2012-11-10 22:02:24
|
Revision: 33
http://wzredemption.svn.sourceforge.net/wzredemption/?rev=33&view=rev
Author: pheonixstorm
Date: 2012-11-10 22:02:17 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Replaced uppercase header names with lowercase names to match current files
Modified Paths:
--------------
trunk/lib/widget/bar.c
trunk/lib/widget/button.c
trunk/lib/widget/editbox.c
trunk/lib/widget/form.c
trunk/lib/widget/form.h
trunk/lib/widget/label.c
trunk/lib/widget/slider.c
trunk/lib/widget/tip.c
trunk/lib/widget/widgbase.h
trunk/lib/widget/widget.c
trunk/lib/widget/widget.h
Modified: trunk/lib/widget/bar.c
===================================================================
--- trunk/lib/widget/bar.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/bar.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -5,13 +5,13 @@
*/
-#include "Widget.h"
-#include "WidgInt.h"
-#include "Tip.h"
-#include "Form.h"
-#include "Bar.h"
-#include "Vid.h"
-#include "PiePalette.h"
+#include "widget.h"
+#include "widgint.h"
+#include "tip.h"
+#include "form.h"
+#include "bar.h"
+#include "vid.h"
+#include "piepalette.h"
/* The widget heap */
OBJ_HEAP *psBarHeap;
Modified: trunk/lib/widget/button.c
===================================================================
--- trunk/lib/widget/button.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/button.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -4,13 +4,13 @@
* Functions for the button widget
*/
-#include "Frame.h"
-#include "FrameInt.h"
-#include "Widget.h"
-#include "WidgInt.h"
-#include "Button.h"
-#include "Form.h"
-#include "Tip.h"
+#include "frame.h"
+#include "frameint.h"
+#include "widget.h"
+#include "widgint.h"
+#include "button.h"
+#include "form.h"
+#include "tip.h"
#include "vid.h"
/* The widget heap */
Modified: trunk/lib/widget/editbox.c
===================================================================
--- trunk/lib/widget/editbox.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/editbox.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -4,12 +4,12 @@
* Functions for the edit box widget.
*/
-#include "Frame.h"
-#include "Widget.h"
-#include "WidgInt.h"
-#include "EditBox.h"
-#include "Form.h"
-#include "Vid.h"
+#include "frame.h"
+#include "widget.h"
+#include "widgint.h"
+#include "editbox.h"
+#include "form.h"
+#include "vid.h"
/* Pixel gap between edge of edit box and text */
#define WEDB_XGAP 4
Modified: trunk/lib/widget/form.c
===================================================================
--- trunk/lib/widget/form.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/form.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -4,13 +4,13 @@
* Functionality for the form widget.
*/
-#include "Frame.h"
-#include "Widget.h"
-#include "WidgInt.h"
-#include "Form.h"
-#include "Tip.h"
-#include "Vid.h"
-#include "PiePalette.h"
+#include "frame.h"
+#include "widget.h"
+#include "widgint.h"
+#include "form.h"
+#include "tip.h"
+#include "vid.h"
+#include "piepalette.h"
/* The widget heaps */
OBJ_HEAP *psFormHeap;
Modified: trunk/lib/widget/form.h
===================================================================
--- trunk/lib/widget/form.h 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/form.h 2012-11-10 22:02:17 UTC (rev 33)
@@ -169,5 +169,8 @@
extern void formDisplayClickable(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
extern void formDisplayTabbed(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
+/* Previously undefined prototype */
+extern void formClearFlash(W_FORM *psWidget);
+
#endif
Modified: trunk/lib/widget/label.c
===================================================================
--- trunk/lib/widget/label.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/label.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -4,13 +4,12 @@
* Functions for the label widget.
*/
-
-#include "Frame.h"
-#include "Widget.h"
-#include "WidgInt.h"
-#include "Label.h"
-#include "Form.h"
-#include "Tip.h"
+#include "frame.h"
+#include "widget.h"
+#include "widgint.h"
+#include "label.h"
+#include "form.h"
+#include "tip.h"
#include "vid.h"
/* The widget heaps */
Modified: trunk/lib/widget/slider.c
===================================================================
--- trunk/lib/widget/slider.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/slider.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -5,10 +5,10 @@
*/
-#include "Widget.h"
-#include "WidgInt.h"
-#include "Slider.h"
-#include "Vid.h"
+#include "widget.h"
+#include "widgint.h"
+#include "slider.h"
+#include "vid.h"
/* The widget heaps */
OBJ_HEAP *psSldHeap;
Modified: trunk/lib/widget/tip.c
===================================================================
--- trunk/lib/widget/tip.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/tip.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -5,12 +5,12 @@
*
*/
-#include "Frame.h"
-#include "FrameInt.h"
-#include "Widget.h"
-#include "WidgInt.h"
-#include "Tip.h"
-#include "Vid.h"
+#include "frame.h"
+#include "frameint.h"
+#include "widget.h"
+#include "widgint.h"
+#include "tip.h"
+#include "vid.h"
/* Time delay before showing the tool tip */
Modified: trunk/lib/widget/widgbase.h
===================================================================
--- trunk/lib/widget/widgbase.h 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/widgbase.h 2012-11-10 22:02:17 UTC (rev 33)
@@ -6,7 +6,7 @@
#ifndef _widgbase_h
#define _widgbase_h
-#include "Frame.h"
+#include "frame.h"
/* The different base types of widget */
typedef enum _widget_type
Modified: trunk/lib/widget/widget.c
===================================================================
--- trunk/lib/widget/widget.c 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/widget.c 2012-11-10 22:02:17 UTC (rev 33)
@@ -5,20 +5,20 @@
*/
-#include "Frame.h"
-#include "FrameInt.h"
+#include "frame.h"
+#include "frameint.h"
-#include "Widget.h"
-#include "WidgInt.h"
+#include "widget.h"
+#include "widgint.h"
-#include "Form.h"
-#include "Label.h"
-#include "Button.h"
-#include "EditBox.h"
-#include "Bar.h"
-#include "Slider.h"
+#include "form.h"
+#include "label.h"
+#include "button.h"
+#include "editbox.h"
+#include "bar.h"
+#include "slider.h"
-#include "Tip.h"
+#include "tip.h"
#include <assert.h>
Modified: trunk/lib/widget/widget.h
===================================================================
--- trunk/lib/widget/widget.h 2012-11-06 18:41:10 UTC (rev 32)
+++ trunk/lib/widget/widget.h 2012-11-10 22:02:17 UTC (rev 33)
@@ -6,8 +6,8 @@
#ifndef _widget_h
#define _widget_h
-#include "Frame.h"
-#include "WidgBase.h"
+#include "frame.h"
+#include "widgbase.h"
/***********************************************************************************
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
