zicodxx
|
20e8b6c497
|
fixed improper player disconnecting which might have been caused by endlevel packet
|
2012-04-23 16:15:20 +02:00 |
|
|
zicodxx
|
4e4f949bc0
|
fixed improper player disconnecting which might have been caused by endlevel packet
|
2012-04-23 16:15:19 +02:00 |
|
Chris Taylor
|
561aba1d9d
|
Change MarkerScale changing keys from KEY_COMMA and KEY_PERIOD to KEY_F11 and KEY_F12 respectively, so I can use the former as controls in the automap
|
2012-04-22 17:38:14 +08:00 |
|
|
zicodxx
|
b02060216e
|
Removed usage of 'oldmaxnet' variable when switching between coop and other game modes which would not be correctly set when coop mode is loaded from a netgame profile; Removed 'MaxNumNetPlayers' variable as already replaced by Netgame.max_numplayers
|
2012-04-18 11:28:23 +02:00 |
|
|
zicodxx
|
d30fb514b1
|
Removed usage of 'oldmaxnet' variable when switching between coop and other game modes which would not be correctly set when coop mode is loaded from a netgame profile; Removed 'MaxNumNetPlayers' variable as already replaced by Netgame.max_numplayers
|
2012-04-18 11:28:21 +02:00 |
|
|
Chris Taylor
|
84bbf2c48e
|
Make a new mission when making a new mine to avoid a crash when testing it straight from the editor and winning, only create a new mine if a mission isn't loaded, init Cursegp to NULL, remove key command for ToggleDrawAllSegments since add segment now has ctrl-A
|
2012-04-17 17:37:15 +08:00 |
|
|
Chris Taylor
|
8b8e5d2635
|
Call new obj_relink_all after playing a demo, so the editor is (hopefully) never faced with poorly linked objects and hence crashes
|
2012-04-17 17:15:09 +08:00 |
|
|
Chris Taylor
|
3e991237ed
|
Call new obj_relink_all after playing a demo, so the editor is (hopefully) never faced with poorly linked objects and hence crashes
|
2012-04-17 17:14:21 +08:00 |
|
|
Chris Taylor
|
0ec49d71bd
|
Rename MessageBoxN (meant to go with previous commit)
|
2012-04-17 16:14:18 +08:00 |
|
|
Chris Taylor
|
ef2df1225d
|
Rename MessageBox to ui_messagebox to avoid a conflict with Windows' MessageBox
|
2012-04-17 16:11:42 +08:00 |
|
|
Chris Taylor
|
7b9f0f8d17
|
Rename MessageBox to ui_messagebox to avoid a conflict with Windows' MessageBox
|
2012-04-17 16:02:32 +08:00 |
|
|
Chris Taylor
|
17bdf55a05
|
Call free_mission() if a demo is corrupt, so the editor doesn't load a corrupt level
|
2012-04-17 15:46:39 +08:00 |
|
|
Chris Taylor
|
7971e8cff8
|
Call free_mission() if a demo is corrupt, so the editor doesn't load a corrupt level
|
2012-04-17 15:45:58 +08:00 |
|
|
Chris Taylor
|
aecfbbee23
|
Set object lifeleft to IMMORTAL_TIME if the byte read in demo playback is -1. This allows the objects to stay when playing a demo, going to the editor then playing the game from the editor
|
2012-04-17 15:36:23 +08:00 |
|
|
Chris Taylor
|
670219fa5a
|
Set object lifeleft to IMMORTAL_TIME if the byte read in demo playback is -1. This allows the objects to stay when playing a demo, going to the editor then playing the game from the editor
|
2012-04-17 15:35:23 +08:00 |
|
|
Chris Taylor
|
7ff82427d9
|
Skip rendering of OBJ_NONE objects to avoid a failed Assert (can happen when playing a demo then going to the editor)
|
2012-04-17 15:20:51 +08:00 |
|
|
Chris Taylor
|
5197d7665a
|
Skip rendering of OBJ_NONE objects to avoid a failed Assert (can happen when playing a demo then going to the editor)
|
2012-04-17 15:20:14 +08:00 |
|
|
Chris Taylor
|
770080f612
|
Reset the player object for the editor, since demo playback mucks it up
|
2012-04-17 15:13:08 +08:00 |
|
|
Chris Taylor
|
36aeba165a
|
Reset the player object for the editor, since demo playback mucks it up
|
2012-04-17 15:11:49 +08:00 |
|
|
Chris Taylor
|
1c85ce7848
|
Finish the game cleanly, closing Game_wind, if Current_level_num is 0
|
2012-04-17 15:05:43 +08:00 |
|
|
Chris Taylor
|
a5f9d3933d
|
Allow level progressing if playing the builtin mission with EDITOR compiled - only exit if Current_level_num is 0
|
2012-04-17 15:04:18 +08:00 |
|
|
Chris Taylor
|
e55406d1ee
|
Make sure Cursegp is initialised if using it to set an object when loading a game (EDITOR build). Thought I already committed this
|
2012-04-17 14:28:50 +08:00 |
|
|
Chris Taylor
|
fa76bc657e
|
Make a new mission when making a new mine to avoid a crash when testing it straight from the editor and winning, only create a new mine if a mission isn't loaded, if it thinks it needs to use Cursegp to fix the player object make sure Cursegp is initialised, remove key command for ToggleDrawAllSegments since add segment now has ctrl-A
|
2012-04-16 16:53:32 +08:00 |
|
|
Chris Taylor
|
1fd979a76b
|
Avoid crashes when clicking on close box with a center, switch, object or wall editing dialog open; also when playing a level, going to the editor, going back to the game then dying
|
2012-04-16 14:42:34 +08:00 |
|
|
Chris Taylor
|
ee9f1b33db
|
Avoid crashes when clicking on close box with a center, switch, object or wall editing dialog open; also when playing a level, going to the editor, going back to the game then dying
|
2012-04-16 14:41:26 +08:00 |
|
|
Chris Taylor
|
82cce8afb6
|
Make movement in the editor's game screen use the player controls, make that movement more like the automap and resolve some likely conflicting key commands
|
2012-04-16 13:26:55 +08:00 |
|
|
Chris Taylor
|
ad5549793f
|
Make movement in the editor's game screen use the player controls, make that movement more like the automap and resolve some likely conflicting key commands
|
2012-04-16 13:26:14 +08:00 |
|
|
zicodxx
|
8fc772586c
|
fixed two bugs caused by recent Multiplayer cleanup: Set more player-death-related veriables outside of dead_player_end() when creating new ship as not covered in subfunction is Palyer_is_dead is not true; also init my own inventory properly in multi_prep_level to get our inventory straight after receiving netgame information
|
2012-04-16 01:13:29 +02:00 |
|
|
zicodxx
|
4287e713b1
|
fixed two bugs caused by recent Multiplayer cleanup: Set more player-death-related veriables outside of dead_player_end() when creating new ship as not covered in subfunction is Palyer_is_dead is not true; also init my own inventory properly in multi_prep_level to get our inventory straight after receiving netgame information
|
2012-04-16 01:13:27 +02:00 |
|
|
zicodxx
|
0011e44087
|
Fixed set but unused variables in OGL build
|
2012-04-15 16:15:21 +02:00 |
|
|
zicodxx
|
e8d4070413
|
Fixed set but unused variables in OGL build
|
2012-04-15 16:15:18 +02:00 |
|
|
zicodxx
|
b6cee230a8
|
made -notitles suppress show_order_form() as well
|
2012-04-15 16:06:45 +02:00 |
|
|
zicodxx
|
8a136a461c
|
addition for last commit - forgot to fix when resolving merge-conflict
|
2012-04-15 16:06:02 +02:00 |
|
|
zicodxx
|
c308f45544
|
addition for last commit - forgot to fix when resolving merge-conflict
|
2012-04-15 16:05:59 +02:00 |
|
|
zicodxx
|
19d792cff2
|
Addition for last change in hmp_reset(): execute midiOutShortMsg() even if midiOutPrepareHeader() fails as not related to SysEx part
|
2012-04-15 15:52:14 +02:00 |
|
|
zicodxx
|
a92f7497a3
|
Addition for last change in hmp_reset(): execute midiOutShortMsg() even if midiOutPrepareHeader() fails as not related to SysEx part
|
2012-04-15 15:52:12 +02:00 |
|
|
zicodxx
|
3a96935748
|
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
|
2012-04-15 15:32:48 +02:00 |
|
|
zicodxx
|
897a6aaf6b
|
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
|
2012-04-15 15:32:46 +02:00 |
|
|
Chris Taylor
|
27279480ca
|
Create a centers dialog that won't crash
|
2012-04-15 14:14:16 +08:00 |
|
|
Chris Taylor
|
311f835bf8
|
Clicking on mine elements in the editor now works in ogl
|
2012-04-15 13:45:45 +08:00 |
|
|
Chris Taylor
|
e1eaf7cc65
|
Clicking on mine elements in the editor now works in ogl
|
2012-04-15 13:43:41 +08:00 |
|
|
Chris Taylor
|
b20044e14f
|
Set edge_list_size to Num_segments*12 to avoid crashes in the editor with certain third party levels
|
2012-04-15 09:34:06 +08:00 |
|
|
Chris Taylor
|
1d05b49978
|
Set edge_list_size to Num_segments*12 to avoid crashes in the editor with certain third party levels
|
2012-04-15 09:32:04 +08:00 |
|
|
zicodxx
|
90e41c1c85
|
When possibly sending player positions prior to firing, do that before messing multibuf; Added more strict sanity checks for outgoing and incoming multi packets; Moved some general game stuff from net_udp_init() to multi_new_game()
|
2012-04-15 03:05:28 +02:00 |
|
|
zicodxx
|
2a15431ec7
|
When possibly sending player positions prior to firing, do that before messing multibuf; Added more strict sanity checks for outgoing and incoming multi packets; Moved some general game stuff from net_udp_init() to multi_new_game()
|
2012-04-15 03:05:25 +02:00 |
|
|
Chris Taylor
|
71831d308f
|
Set the correct edge colors for editor wireframe drawing (in LargeView)
|
2012-04-14 18:52:06 +08:00 |
|
|
Chris Taylor
|
96d872adb8
|
Set the correct palette for the editor
|
2012-04-14 18:29:02 +08:00 |
|
|
Chris Taylor
|
8b22237d4e
|
Set the correct palette for the editor
|
2012-04-14 18:28:07 +08:00 |
|
|
Chris Taylor
|
d0544583fd
|
Fix bugs switching between game and editor and back: make sure ModeFlag is set to 0 before it has any chance to show an alert message, fixing a crash; allow OBJ_NONE in Assert; make Game_wind invisible when loading editor in case we show an alert; call mouse_flush() in ui_init() to fix mouse issues
|
2012-04-14 17:42:44 +08:00 |
|
|
Chris Taylor
|
b80b863f49
|
Fix bugs switching between game and editor and back: make sure ModeFlag is set to 0 before it has any chance to show an alert message, fixing a crash; allow OBJ_NONE in Assert; make Game_wind invisible when loading editor in case we show an alert; call mouse_flush() in ui_init() to fix mouse issues
|
2012-04-14 17:41:50 +08:00 |
|