From 42ba1110638cd1ab0165c916b3ff692f5278c302 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Mon, 28 Jul 2003 03:49:25 +0000 Subject: A few warnings svn-id: r9224 --- sword2/build_display.cpp | 2 +- sword2/driver/driver96.h | 2 ++ sword2/mouse.cpp | 14 +++++++------- sword2/resman.cpp | 2 +- sword2/sound.cpp | 2 +- sword2/speech.cpp | 2 +- sword2/startup.cpp | 2 +- sword2/sword2.cpp | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp index d1fdce5d40..0a7ea7e7e9 100644 --- a/sword2/build_display.cpp +++ b/sword2/build_display.cpp @@ -358,7 +358,7 @@ void DisplayMsg( uint8 *text, int time ) // Chris 15May97 while(GetFadeStatus()==RDFADE_DOWN); } - Set_mouse(NULL); + Set_mouse(0); Set_luggage(0); //tw28Aug EraseBackBuffer(); // for hardware rendering diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index a9b8f35a49..75baa1f2f9 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -1256,6 +1256,8 @@ typedef int BOOL; #define FALSE 0 #ifndef WIN32 +#undef DWORD +#undef LARGE_INTEGER typedef uint32 DWORD; typedef long int LARGE_INTEGER; #endif diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp index e770a1c257..003b91b15d 100644 --- a/sword2/mouse.cpp +++ b/sword2/mouse.cpp @@ -775,7 +775,7 @@ void Mouse_on_off(void) //Tony30Sept96 { // flip to a blank cursor for a cycle mouse_touching=0; // ignore the new id this cycle - should hit next cycle old_mouse_touching=0; // we've moved off - Set_mouse(NULL); // blank cursor + Set_mouse(0); // blank cursor mouse_flicked_off=1; // so we know to set the mouse pointer back to normal if 2nd hot-spot doesn't register because mouse pulled away quickly (onto nothing) // reset luggage only when necessary @@ -1131,8 +1131,8 @@ int32 FN_no_human(int32 *params) //Tony30Sept96 mouse_status=1; //human/mouse off - Set_mouse(NULL); // blank cursor - Set_luggage(NULL); // blank cursor + Set_mouse(0); // blank cursor + Set_luggage(0); // blank cursor //must be normal mouse situation or a largely neutral situation - special menus use No_human @@ -1163,8 +1163,8 @@ void No_human(void) //Tony4June97 mouse_status=1; //human/mouse off - Set_mouse(NULL); // blank cursor - Set_luggage(NULL); // blank cursor + Set_mouse(0); // blank cursor + Set_luggage(0); // blank cursor } //------------------------------------------------------------------------------------ int32 FN_add_human(int32 *params) //Tony30Sept96 @@ -1199,7 +1199,7 @@ int32 FN_add_human(int32 *params) //Tony30Sept96 COMBINE_BASE=0; // - just in case - Set_luggage(NULL); // blank cursor + Set_luggage(0); // blank cursor } @@ -1309,7 +1309,7 @@ int32 FN_blank_mouse(int32 *params) //Tony29Oct96 //no params - Set_mouse(NULL); + Set_mouse(0); if (params); diff --git a/sword2/resman.cpp b/sword2/resman.cpp index 4e4e387f0a..0829243257 100644 --- a/sword2/resman.cpp +++ b/sword2/resman.cpp @@ -1091,7 +1091,7 @@ void resMan::CacheNewCluster(uint32 newCluster) - Set_mouse(NULL); + Set_mouse(0); Set_luggage(0); //tw28Aug uint8 *bgfile; diff --git a/sword2/sound.cpp b/sword2/sound.cpp index bf10f97d97..d320a3fb8a 100644 --- a/sword2/sound.cpp +++ b/sword2/sound.cpp @@ -200,7 +200,7 @@ int32 FN_play_fx(int32 *params) // called from script only Zdebug("SFX (sample=\"%s\", vol=%d, pan=%d, delay=%d, type=%s)", FetchObjectName(params[0]), params[3], params[4], params[2], type); } - #endif _DEBUG + #endif //_DEBUG //---------------------------------- while ((j < FXQ_LENGTH) && (fxq[j].resource != 0)) diff --git a/sword2/speech.cpp b/sword2/speech.cpp index 3cd28d512b..7c9a10e782 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -291,7 +291,7 @@ int32 FN_choose(int32 *params) //Tony19Nov96 IN_SUBJECT=0; - Set_mouse(NULL); //blank mouse again + Set_mouse(0); //blank mouse again // Zdebug("hit %d - ref %d ref*8 %d", hit, subject_list[hit].ref, subject_list[hit].ref*8); diff --git a/sword2/startup.cpp b/sword2/startup.cpp index 048e9cb020..4fbe1a4999 100644 --- a/sword2/startup.cpp +++ b/sword2/startup.cpp @@ -255,7 +255,7 @@ uint32 Con_start(uint8 *input) //Tony15Oct96 - if (*input == NULL) // so that typing 'S' then works on NT (James26feb97) + if (*input == 0) // so that typing 'S' then works on NT (James26feb97) { Con_print_start_menu(); return(1); diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index e9635a20db..cd80a02482 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -520,8 +520,8 @@ void PauseGame(void) // James17jun97 //make a normal mouse ClearPointerText(); // mouse_mode=MOUSE_normal; - SetLuggageAnim(NULL, NULL); //this is the only place allowed to do it this way - Set_mouse(NULL); // blank cursor + SetLuggageAnim(NULL, 0); //this is the only place allowed to do it this way + Set_mouse(0); // blank cursor mouse_touching=1; //forces engine to choose a cursor if (current_graphics_level==3) // if level at max -- cgit v1.2.3