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

free grabbed mouse in Demo Playback; improved Player-files deletion

Browse source
This commit is contained in:
zicodxx 2007-05-16 11:26:34 +00:00
parent 90ee584b28
commit c2270758ef
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog D2X-Rebirth Changelog
20070516
--------
main/game.c, main/inferno.c, main/newmenu.c: free grabbed mouse in Demo Playback; improved Player-files deletion
20070514 20070514
-------- --------
SConstruct, arch/sdl/init.c, arch/sdl/joydefs.c, arch/sdl/mouse.c, arch/include/mouse.h, include/error.h, main/config.h main/game.c, main/gamecntl.c, main/inferno.c, main/kconfig.c, main/kconfig.h, main/newmenu.c, main/newmenu.h, main/playsave.c, main/text.h: Added config field to map a Mouse Axis/Wheel to cycle Primary and Secondary weapons; lots of controls-related code cleaning SConstruct, arch/sdl/init.c, arch/sdl/joydefs.c, arch/sdl/mouse.c, arch/include/mouse.h, include/error.h, main/config.h main/game.c, main/gamecntl.c, main/inferno.c, main/kconfig.c, main/kconfig.h, main/newmenu.c, main/newmenu.h, main/playsave.c, main/text.h: Added config field to map a Mouse Axis/Wheel to cycle Primary and Secondary weapons; lots of controls-related code cleaning

2
main/gamecntl.c
View file

@ -536,7 +536,7 @@ int do_game_pause()
} }
/* keep the mouse from wandering in SDL */ /* keep the mouse from wandering in SDL */
if (FindArg("-grabmouse")) if (FindArg("-grabmouse") && (Newdemo_state != ND_STATE_PLAYBACK))
SDL_WM_GrabInput(SDL_GRAB_ON); SDL_WM_GrabInput(SDL_GRAB_ON);
clear_boxed_message(); clear_boxed_message();

2
main/inferno.c
View file

@ -813,7 +813,7 @@ int main(int argc, char *argv[])
#endif #endif
/* keep the mouse from wandering in SDL */ /* keep the mouse from wandering in SDL */
if (FindArg("-grabmouse")) if (FindArg("-grabmouse") && (Newdemo_state != ND_STATE_PLAYBACK))
SDL_WM_GrabInput(SDL_GRAB_ON); SDL_WM_GrabInput(SDL_GRAB_ON);
game(); game();

4
main/newmenu.c
View file

@ -2211,8 +2211,8 @@ ReadFileNames:
if ((!ret) && player_mode) { if ((!ret) && player_mode) {
delete_player_saved_games( &filenames[citem*14] ); delete_player_saved_games( &filenames[citem*14] );
// also delete PLX file // delete PLX file
sprintf(plxfile,"%.8s.plx",Players[Player_num].callsign); sprintf(plxfile,"%.8s.plx",&filenames[citem*14]);
if (cfexist(plxfile)) if (cfexist(plxfile))
PHYSFS_delete(plxfile); PHYSFS_delete(plxfile);
} }