adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3514 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2010-01-23 22:53:19 +00:00
parent 3fbcb78b99
commit 398b33315f
31 changed files with 174 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/msvc6/UrQuanMasters.dsp
+112
View File
@@ -2336,6 +2336,10 @@ SOURCE=..\..\src\uqm\ships\androsyn\androsyn.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\androsyn\androsyn.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\androsyn\icode.h
# End Source File
# Begin Source File
@@ -2352,6 +2356,10 @@ SOURCE=..\..\src\uqm\ships\arilou\arilou.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\arilou\arilou.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\arilou\icode.h
# End Source File
# Begin Source File
@@ -2368,6 +2376,10 @@ SOURCE=..\..\src\uqm\ships\blackurq\blackurq.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\blackurq\blackurq.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\blackurq\icode.h
# End Source File
# Begin Source File
@@ -2384,6 +2396,10 @@ SOURCE=..\..\src\uqm\ships\chenjesu\chenjesu.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\chenjesu\chenjesu.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\chenjesu\icode.h
# End Source File
# Begin Source File
@@ -2400,6 +2416,10 @@ SOURCE=..\..\src\uqm\ships\chmmr\chmmr.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\chmmr\chmmr.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\chmmr\icode.h
# End Source File
# Begin Source File
@@ -2416,6 +2436,10 @@ SOURCE=..\..\src\uqm\ships\druuge\druuge.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\druuge\druuge.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\druuge\icode.h
# End Source File
# Begin Source File
@@ -2432,6 +2456,10 @@ SOURCE=..\..\src\uqm\ships\human\human.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\human\human.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\human\icode.h
# End Source File
# Begin Source File
@@ -2452,6 +2480,10 @@ SOURCE=..\..\src\uqm\ships\ilwrath\ilwrath.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\ilwrath\ilwrath.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\ilwrath\resinst.h
# End Source File
# End Group
@@ -2468,6 +2500,10 @@ SOURCE=..\..\src\uqm\ships\lastbat\lastbat.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\lastbat\lastbat.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\lastbat\resinst.h
# End Source File
# End Group
@@ -2484,6 +2520,10 @@ SOURCE=..\..\src\uqm\ships\melnorme\melnorme.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\melnorme\melnorme.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\melnorme\resinst.h
# End Source File
# End Group
@@ -2500,6 +2540,10 @@ SOURCE=..\..\src\uqm\ships\mmrnmhrm\mmrnmhrm.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\mmrnmhrm\mmrnmhrm.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\mmrnmhrm\resinst.h
# End Source File
# End Group
@@ -2516,6 +2560,10 @@ SOURCE=..\..\src\uqm\ships\mycon\mycon.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\mycon\mycon.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\mycon\resinst.h
# End Source File
# End Group
@@ -2532,6 +2580,10 @@ SOURCE=..\..\src\uqm\ships\orz\orz.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\orz\orz.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\orz\resinst.h
# End Source File
# End Group
@@ -2548,6 +2600,10 @@ SOURCE=..\..\src\uqm\ships\pkunk\pkunk.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\pkunk\pkunk.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\pkunk\resinst.h
# End Source File
# End Group
@@ -2564,6 +2620,10 @@ SOURCE=..\..\src\uqm\ships\probe\probe.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\probe\probe.h
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\probe\resinst.h
# End Source File
# End Group
@@ -2582,6 +2642,10 @@ SOURCE=..\..\src\uqm\ships\shofixti\resinst.h
SOURCE=..\..\src\uqm\ships\shofixti\shofixti.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\shofixti\shofixti.h
# End Source File
# End Group
# Begin Group "sis_ship"
@@ -2618,6 +2682,10 @@ SOURCE=..\..\src\uqm\ships\sis_ship\restypes.h
SOURCE=..\..\src\uqm\ships\sis_ship\sis_ship.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\sis_ship\sis_ship.h
# End Source File
# End Group
# Begin Group "slylandr"
@@ -2634,6 +2702,10 @@ SOURCE=..\..\src\uqm\ships\slylandr\resinst.h
SOURCE=..\..\src\uqm\ships\slylandr\slylandr.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\slylandr\slylandr.h
# End Source File
# End Group
# Begin Group "spathi"
@@ -2650,6 +2722,10 @@ SOURCE=..\..\src\uqm\ships\spathi\resinst.h
SOURCE=..\..\src\uqm\ships\spathi\spathi.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\spathi\spathi.h
# End Source File
# End Group
# Begin Group "supox"
@@ -2666,6 +2742,10 @@ SOURCE=..\..\src\uqm\ships\supox\resinst.h
SOURCE=..\..\src\uqm\ships\supox\supox.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\supox\supox.h
# End Source File
# End Group
# Begin Group "syreen"
@@ -2682,6 +2762,10 @@ SOURCE=..\..\src\uqm\ships\syreen\resinst.h
SOURCE=..\..\src\uqm\ships\syreen\syreen.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\syreen\syreen.h
# End Source File
# End Group
# Begin Group "thradd"
@@ -2698,6 +2782,10 @@ SOURCE=..\..\src\uqm\ships\thradd\resinst.h
SOURCE=..\..\src\uqm\ships\thradd\thradd.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\thradd\thradd.h
# End Source File
# End Group
# Begin Group "umgah"
@@ -2714,6 +2802,10 @@ SOURCE=..\..\src\uqm\ships\umgah\resinst.h
SOURCE=..\..\src\uqm\ships\umgah\umgah.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\umgah\umgah.h
# End Source File
# End Group
# Begin Group "urquan"
@@ -2730,6 +2822,10 @@ SOURCE=..\..\src\uqm\ships\urquan\resinst.h
SOURCE=..\..\src\uqm\ships\urquan\urquan.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\urquan\urquan.h
# End Source File
# End Group
# Begin Group "utwig"
@@ -2746,6 +2842,10 @@ SOURCE=..\..\src\uqm\ships\utwig\resinst.h
SOURCE=..\..\src\uqm\ships\utwig\utwig.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\utwig\utwig.h
# End Source File
# End Group
# Begin Group "vux"
@@ -2762,6 +2862,10 @@ SOURCE=..\..\src\uqm\ships\vux\resinst.h
SOURCE=..\..\src\uqm\ships\vux\vux.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\vux\vux.h
# End Source File
# End Group
# Begin Group "yehat"
@@ -2778,6 +2882,10 @@ SOURCE=..\..\src\uqm\ships\yehat\resinst.h
SOURCE=..\..\src\uqm\ships\yehat\yehat.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\yehat\yehat.h
# End Source File
# End Group
# Begin Group "zoqfot"
@@ -2794,6 +2902,10 @@ SOURCE=..\..\src\uqm\ships\zoqfot\resinst.h
SOURCE=..\..\src\uqm\ships\zoqfot\zoqfot.c
# End Source File
# Begin Source File
SOURCE=..\..\src\uqm\ships\zoqfot\zoqfot.h
# End Source File
# End Group
# Begin Source File
sc2/src/uqm/dummy.h
+28 -28
View File
@@ -19,34 +19,34 @@
#include "races.h"
RACE_DESC *init_androsynth (void);
RACE_DESC *init_arilou (void);
RACE_DESC *init_black_urquan (void);
RACE_DESC *init_chenjesu (void);
RACE_DESC *init_chmmr (void);
RACE_DESC *init_druuge (void);
RACE_DESC *init_human (void);
RACE_DESC *init_ilwrath (void);
RACE_DESC *init_melnorme (void);
RACE_DESC *init_mmrnmhrm (void);
RACE_DESC *init_mycon (void);
RACE_DESC *init_orz (void);
RACE_DESC *init_pkunk (void);
RACE_DESC *init_shofixti (void);
RACE_DESC *init_slylandro (void);
RACE_DESC *init_spathi (void);
RACE_DESC *init_supox (void);
RACE_DESC *init_syreen (void);
RACE_DESC *init_thraddash (void);
RACE_DESC *init_umgah (void);
RACE_DESC *init_urquan (void);
RACE_DESC *init_utwig (void);
RACE_DESC *init_vux (void);
RACE_DESC *init_yehat (void);
RACE_DESC *init_zoqfotpik (void);
RACE_DESC *init_samatra (void);
RACE_DESC *init_sis (void);
RACE_DESC *init_probe (void);
#include "ships/androsyn/androsyn.h"
#include "ships/arilou/arilou.h"
#include "ships/blackurq/blackurq.h"
#include "ships/chenjesu/chenjesu.h"
#include "ships/chmmr/chmmr.h"
#include "ships/druuge/druuge.h"
#include "ships/human/human.h"
#include "ships/ilwrath/ilwrath.h"
#include "ships/melnorme/melnorme.h"
#include "ships/mmrnmhrm/mmrnmhrm.h"
#include "ships/mycon/mycon.h"
#include "ships/orz/orz.h"
#include "ships/pkunk/pkunk.h"
#include "ships/shofixti/shofixti.h"
#include "ships/slylandr/slylandr.h"
#include "ships/spathi/spathi.h"
#include "ships/supox/supox.h"
#include "ships/syreen/syreen.h"
#include "ships/thradd/thradd.h"
#include "ships/umgah/umgah.h"
#include "ships/urquan/urquan.h"
#include "ships/utwig/utwig.h"
#include "ships/vux/vux.h"
#include "ships/yehat/yehat.h"
#include "ships/zoqfot/zoqfot.h"
#include "ships/lastbat/lastbat.h"
#include "ships/sis_ship/sis_ship.h"
#include "ships/probe/probe.h"
#endif /* DUMMY_H */
sc2/src/uqm/ships/androsyn/androsyn.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "androsyn.h"
#include "resinst.h"
#include "libs/mathlib.h"
sc2/src/uqm/ships/arilou/arilou.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "arilou.h"
#include "resinst.h"
#include "libs/mathlib.h"
sc2/src/uqm/ships/blackurq/blackurq.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "blackurq.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/chenjesu/chenjesu.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "chenjesu.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/chmmr/chmmr.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "chmmr.h"
#include "resinst.h"
#include "uqm/colors.h"
sc2/src/uqm/ships/druuge/druuge.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "druuge.h"
#include "resinst.h"
#define MAX_CREW 14
sc2/src/uqm/ships/human/human.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "human.h"
#include "resinst.h"
#include "uqm/colors.h"
sc2/src/uqm/ships/ilwrath/ilwrath.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "ilwrath.h"
#include "resinst.h"
#include "uqm/colors.h"
sc2/src/uqm/ships/lastbat/lastbat.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "lastbat.h"
#include "resinst.h"
#include "uqm/colors.h"
sc2/src/uqm/ships/melnorme/melnorme.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "melnorme.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "mmrnmhrm.h"
#include "resinst.h"
sc2/src/uqm/ships/mycon/mycon.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "mycon.h"
#include "resinst.h"
#define MAX_CREW 20
sc2/src/uqm/ships/orz/orz.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "orz.h"
#include "resinst.h"
#include "uqm/colors.h"
sc2/src/uqm/ships/pkunk/pkunk.c
+3 -2
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "pkunk.h"
#include "resinst.h"
#include "uqm/globdata.h"
@@ -314,7 +315,7 @@ intercept_pkunk_death (ELEMENT *ElementPtr)
#define START_PHOENIX_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A)
#define TRANSITION_LIFE 1
void
static void
spawn_phoenix_trail (ELEMENT *ElementPtr)
{
static const Color colorTable[] =
@@ -349,7 +350,7 @@ spawn_phoenix_trail (ELEMENT *ElementPtr)
#define PHOENIX_LIFE 12
void
static void
phoenix_transition (ELEMENT *ElementPtr)
{
HELEMENT hShipImage;
sc2/src/uqm/ships/probe/probe.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "probe.h"
#include "resinst.h"
#define MAX_CREW 1
sc2/src/uqm/ships/shofixti/shofixti.c
+3 -3
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "shofixti.h"
#include "resinst.h"
#include "uqm/globdata.h"
@@ -222,9 +223,8 @@ destruct_preprocess (ELEMENT *ElementPtr)
}
/* In order to detect any Orz Marines that have boarded the ship
when it self-destructs, we'll need to see these Orz functions */
extern void intruder_preprocess (ELEMENT*);
extern void marine_collision (ELEMENT*, POINT*, ELEMENT*, POINT*);
when it self-destructs, we'll need to see some Orz functions */
#include "../orz/orz.h"
#define ORZ_MARINE(ptr) (ptr->preprocess_func == intruder_preprocess && \
ptr->collision_func == marine_collision)
sc2/src/uqm/ships/sis_ship/sis_ship.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "sis_ship.h"
#include "resinst.h"
#include "uqm/colors.h"
sc2/src/uqm/ships/slylandr/slylandr.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "slylandr.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/spathi/spathi.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "spathi.h"
#include "resinst.h"
#define MAX_CREW 30
sc2/src/uqm/ships/supox/supox.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "supox.h"
#include "resinst.h"
#include "libs/mathlib.h"
sc2/src/uqm/ships/syreen/syreen.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "syreen.h"
#include "resinst.h"
#include "libs/mathlib.h"
sc2/src/uqm/ships/thradd/thradd.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "thradd.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/umgah/umgah.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "umgah.h"
#include "resinst.h"
#include "libs/mathlib.h"
sc2/src/uqm/ships/urquan/urquan.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "urquan.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/utwig/utwig.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "utwig.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/vux/vux.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "vux.h"
#include "resinst.h"
#include "uqm/globdata.h"
sc2/src/uqm/ships/yehat/yehat.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "yehat.h"
#include "resinst.h"
#include "libs/mathlib.h"
sc2/src/uqm/ships/zoqfot/zoqfot.c
+1
View File
@@ -17,6 +17,7 @@
*/
#include "../ship.h"
#include "zoqfot.h"
#include "resinst.h"
#include "libs/mathlib.h"
sc2/src/uqm/tactrans.c
+2 -2
View File
@@ -425,7 +425,7 @@ new_ship (ELEMENT *DeadShipPtr)
}
}
void
static void
explosion_preprocess (ELEMENT *ShipPtr)
{
BYTE i;
@@ -580,7 +580,7 @@ ship_death (ELEMENT *ShipPtr)
// Called from the death_func of an element for an ion trail pixel, or a
// ship shadow (when warping in/out).
void
static void
cycle_ion_trail (ELEMENT *ElementPtr)
{
static const Color colorTab[] =