[Wzredemption-svn] SF.net SVN: wzredemption:[40] trunk/src
Status: Beta
Brought to you by:
pheonixstorm
|
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] |