Commit a77e03b4 authored by Peter Achten's avatar Peter Achten
Browse files

(PA) removed C warnings;

include names corrected to _12 convention.
parent 22da7190
/* Clean Game Library by Mike Wiering, Nijmegen */ /* Clean Game Library by Mike Wiering, Nijmegen */
#include "util.h" #include "util_12.h"
#include "intrface.h" #include "intrface_12.h"
#include "cGameLib.h" #include "cGameLib_12.h"
#include "cOSGameLib.h" /* OS specific functions */ #include "cOSGameLib_12.h" /* OS specific functions */
// #define SMART_DRAW // #define SMART_DRAW
...@@ -211,7 +211,7 @@ static USER_EVENT_INFO *ueiUserEventInfo = NULL; ...@@ -211,7 +211,7 @@ static USER_EVENT_INFO *ueiUserEventInfo = NULL;
#define EV_PLAY_SOUND (-1) #define EV_PLAY_SOUND (-1)
ClearUserEvents () void ClearUserEvents ()
{ {
struct USER_EVENT_INFO *ueiNext; struct USER_EVENT_INFO *ueiNext;
...@@ -782,7 +782,6 @@ void RunGame () ...@@ -782,7 +782,6 @@ void RunGame ()
int fade; int fade;
int result; int result;
int oos;
iFrameCounter = 0; iFrameCounter = 0;
CorrectView (); CorrectView ();
...@@ -1391,7 +1390,7 @@ int ReadBoundMapValue (int x, int y, int options, int bounds, int mccode) ...@@ -1391,7 +1390,7 @@ int ReadBoundMapValue (int x, int y, int options, int bounds, int mccode)
} }
Bounce (OBJECTREC *obj, int bound) void Bounce (OBJECTREC *obj, int bound)
{ {
int xb = obj->iXBounce; int xb = obj->iXBounce;
int yb = obj->iYBounce; int yb = obj->iYBounce;
...@@ -1602,7 +1601,6 @@ void MoveObjects () ...@@ -1602,7 +1601,6 @@ void MoveObjects ()
// int md = obj->iMoveDelay; // int md = obj->iMoveDelay;
int slx = obj->iXSlowDown; int slx = obj->iXSlowDown;
int sly = obj->iYSlowDown; int sly = obj->iYSlowDown;
int xv, yv;
// save last position // save last position
obj->iLastXPos = obj->iXPos; obj->iLastXPos = obj->iXPos;
...@@ -2374,7 +2372,7 @@ void DrawObjects (int FromLayer, int ToLayer) ...@@ -2374,7 +2372,7 @@ void DrawObjects (int FromLayer, int ToLayer)
SPRITEANIMATION *sa; SPRITEANIMATION *sa;
RECT src, dst; RECT src, dst;
int flags, fx; int fx;
while (obj) while (obj)
{ {
...@@ -2554,7 +2552,7 @@ int DrawLayer (int mapid) ...@@ -2554,7 +2552,7 @@ int DrawLayer (int mapid)
int curw, curh; int curw, curh;
int mappos, mapblock; int mappos, mapblock;
int bmpx, bmpy; int bmpx, bmpy;
int flags, bltflags, fx; int fx;
int maxblock; int maxblock;
BOOL mir, ups; BOOL mir, ups;
...@@ -2694,7 +2692,6 @@ int DrawLayer (int mapid) ...@@ -2694,7 +2692,6 @@ int DrawLayer (int mapid)
int NextFrame (int fade) int NextFrame (int fade)
{ {
int resultcode; int resultcode;
DDBLTFX ddbltfx;
BOOL clear; BOOL clear;
GAMELAYERMAPINFO *glmip = glmipGameLayerMapInfo; GAMELAYERMAPINFO *glmip = glmipGameLayerMapInfo;
SPRITEANIMATION *sa = saSprites; SPRITEANIMATION *sa = saSprites;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/* Clean Game Library by Mike Wiering, Nijmegen */ /* Clean Game Library by Mike Wiering, Nijmegen */
#include "cOSGameLib.h" /* OS specific functions */ #include "cOSGameLib_12.h" /* OS specific functions */
/* Nothing value for integer, used with Maybe values */ /* Nothing value for integer, used with Maybe values */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* DirectX implementation of the OS specific functions */ /* DirectX implementation of the OS specific functions */
#include "cOSGameLib.h" #include "cOSGameLib_12.h"
extern HWND ghMainWindow; extern HWND ghMainWindow;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment