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

Moved piggy init loading for D1 missions to load_mission_d1

Browse source
This commit is contained in:
zicodxx 2007-08-24 13:36:01 +00:00
parent dfb133d378
commit be2eff9ae3
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.txt
View file

@ -3,10 +3,12 @@ D2X-Rebirth Changelog
20070824
--------
main/game.c, main/gamecntl.c, main/gamerend.c: allow framerate indicator to be toggled in-game again
main/mission.c, main/menu.c: Moved piggy init loading for D1 missions to load_mission_d1
20070822
--------
SConstruct: Removed hardcoded CPPPATH for MinGW environment - obsolete since r487
20070821
--------
arch/linux/linuxnet.c, arch/win32/winnet.c, include/ipx.h, main/network.c: Added ipx_check_ready_to_join for driver element CheckReadyToJoin, making sure communication between UDP/IP clients

2
arch/sdl/mixdigi.c
View file

@ -143,7 +143,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
int mix_loop = looping * -1;
if (MIX_DIGI_DEBUG) printf("digi_start_sound %d, volume %d, pan %d (start=%d, end=%d)\n", soundnum, mix_vol, mix_pan, loop_start, loop_end);
printf("%i, %i\n",(SoundChunks[soundnum]), mix_loop);
int channel = Mix_PlayChannel(-1, &(SoundChunks[soundnum]), mix_loop);
Mix_SetPanning(channel, 255-mix_pan, mix_pan);
Mix_SetDistance(channel, 255-mix_vol);

2
main/menu.c
View file

@ -155,7 +155,6 @@ void ipx_set_driver(int ipx_driver);
#endif //NETWORK
void do_cpu_menu();
extern void newmenu_close();
extern void piggy_init_pigfile(char *filename);
//returns the number of demo files on the disk
int newdemo_count_demos();
@ -272,7 +271,6 @@ int DoMenu()
return 0;
}
piggy_init_pigfile("groupa.pig"); //get correct pigfile
load_palette(MENU_PALETTE,0,1); //get correct palette
if ((Game_mode & GM_SERIAL) || (Game_mode & GM_MODEM)) {

4
main/mission.c
View file

@ -71,6 +71,8 @@ int num_missions = -1;
Mission *Current_mission = NULL; // currently loaded mission
extern void piggy_init_pigfile(char *filename);
//
// Special versions of mission routines for d1 builtins
//
@ -79,6 +81,8 @@ int load_mission_d1(void)
{
int i;
piggy_init_pigfile("groupa.pig"); //get correct pigfile
switch (cfile_size("descent.hog")) {
case D1_SHAREWARE_MISSION_HOGSIZE:
case D1_SHAREWARE_10_MISSION_HOGSIZE: