TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed small compiling issues

Browse source
This commit is contained in:
zicodxx 2008-01-25 12:50:23 +00:00
parent f6b24b16d4
commit b54bdcba5b
6 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.txt
View file

@ -1,8 +1,12 @@
D1X-Rebirth Changelog
20080114
20080125
--------
INSTALL.txt, main/game.c, main/mission.h, main/network.c: Updated Docs - Data files mus bt lowercase; Fixed small Multiplayer issues
main/collide.c, main/custom.c, main/kconfig.h, main/newdemo.c, main/powerup.c: Fixed small compiling issues
20080124
--------
INSTALL.txt, main/game.c, main/mission.h, main/network.c: Updated Docs - Data files must be lowercase; Fixed small Multiplayer issues
20080123
--------

2
main/collide.c
View file

@ -1096,7 +1096,7 @@ void drop_pow_count(object *obj, int *pow_count)
mprintf((1, "want %d start %d now %d\n", count, powerup_start_level[i], powerup_in_level[i]));
if (multi_allow_powerup_mask[i])
{ // only check 'important' powerups (no shield,energy,conc)
int pow_max = MAX(powerup_start_level[i] - powerup_in_level[i], 0);
int pow_max = max(powerup_start_level[i] - powerup_in_level[i], 0);
//-killed- #ifdef NETWORK
while (count > pow_max)

4
main/custom.c
View file

@ -223,7 +223,7 @@ int load_pog(CFILE *f, int pog_sig, int pog_ver, int *num_custom, struct custom_
// load custom textures/sounds from pog/pig file
// returns 0 if ok, <0 on error
int load_pigpog(const char *pogname) {
int load_pigpog(char *pogname) {
int num_custom;
grs_bitmap *bmp;
digi_sound *snd;
@ -409,7 +409,7 @@ int read_d2_robot_info(CFILE *fp, robot_info *ri)
return 1;
}
void load_hxm(const char *hxmname) {
void load_hxm(char *hxmname) {
unsigned int repl_num;
int i;
CFILE *f;

1
main/kconfig.h
View file

@ -82,7 +82,6 @@ extern char *control_text[CONTROL_MAX_TYPES];
extern void kc_set_controls();
extern void reset_cruise(void);
extern int kconfig_is_axes_used(int axis);
extern void kconfig_init_external_controls(int intno, ssize_t address);
extern void HUD_init_message(char * format, ...);
extern int isJoyRotationKey(int test_key); //tells if "test_key" is setup for rotation on the joy
extern int isMouseRotationKey(int test_key); //tells if "test_key" is setup for rotation on the mouse

2
main/newdemo.c
View file

@ -2771,6 +2771,8 @@ void newdemo_stop_recording()
unsigned short byte_count = 0;
#endif
exit = 0;
nd_write_byte(ND_EVENT_EOF);
nd_write_short(frame_bytes_written - 1);
if (Game_mode & GM_MULTI) {

2
main/powerup.c
View file

@ -667,7 +667,7 @@ int may_create_powerup(int powerup)
powerup_start_level[powerup] - pow_count[powerup]));
#endif
// if(powerup==POW_SHIELD_BOOST) return 1;
return MAX(powerup_start_level[powerup] - pow_count[powerup], 0);
return max(powerup_start_level[powerup] - pow_count[powerup], 0);
#endif
return -1;
}