Commit graph

1103 commits

Author SHA1 Message Date
Chris Taylor 015bf19085 Increment version number for Mac files (should have committed this ages ago) 2012-07-24 16:33:04 +08:00
zicodxx 7c5aaa29df Redefined lotsa variables, functions and parameters as const and/or static - patch by Kp 2012-07-23 01:17:54 +02:00
zicodxx 13cd7d8837 cleanup for netgame help menu and incremented multi proto vwersion due to recent code changes (d1x mostly however) 2012-06-18 01:43:46 +02:00
zicodxx 583187db68 removed temp_string buffer for ingame message inputs preventing the string from being messed up if containing special characters 2012-06-18 01:23:32 +02:00
zicodxx 29ad124ea3 added songs_play_file() to play any song depending on filename-extension as a more streamlined approach to handle all different kinds of formats; also used for jukebox to make it independent from SDL_mixer; cleaned up supported filename extenstions 2012-06-10 14:02:43 +02:00
zicodxx b0288d8df0 removed MarkerOwner; some code cleaning in that regard 2012-06-10 11:26:29 +02:00
zicodxx edf56169ab do not write player file each time lifetime stats change to prevent hickups on killing 2012-06-08 23:13:33 +02:00
zicodxx 2055192b67 in vms_matrix_from_quaternion put the definition of tmp1 and tmp2 variables at the beginning of the functions because i was a baaaad boy 2012-06-08 15:54:17 +02:00
zicodxx 98bf17c08c Switching keyboard sensitivity function from variable increase to variable offset, making the ship more responsive in higher settings 2012-06-08 12:22:45 +02:00
zicodxx d910fd0e7c cleanly decide it to drop a hoard orb depending on wether we were killed by ourselves, en enemy or team-mate without any ugly and unreliable hacks 2012-06-08 01:41:31 +02:00
zicodxx f449e24d69 changed extension for archive (addon) content from zip to dxa - still a zip-file but renamed to not accidentially add user generated backups and possibly mess things up 2012-06-01 13:04:29 +02:00
zicodxx c8680ef789 use size of output buffer for snprintf; on the way changed rebirth-specific song file to dxx-r.sng to respect hog 8+3 file convention 2012-06-01 12:46:03 +02:00
zicodxx 8b3b6c5c1c Introduced sensitivity sliders for keyboard which cause movement increase the longer the designated key is pressed 2012-06-01 11:53:59 +02:00
zicodxx 886f313cfe Removed Laser_offset hack 2012-05-28 00:08:09 +02:00
zicodxx 45646d12d6 removed weapon_rate_scale() which should be obsolete due to other optimizations in network code 2012-05-27 15:04:45 +02:00
zicodxx 6ee7c2f092 Removed remnants of the old and obsolete VR implementation 2012-05-27 00:24:57 +02:00
zicodxx 12b30ed446 fixed possible buffer overflow in load_screen_text() 2012-05-26 19:39:14 +02:00
zicodxx 3d10827ca3 Optimization for quaternion structure: Stuffed orientation in shorts and removed figure out segnum by position - saving 10 bytes for each positional update in Multiplayer; Also removed render_type from pdata to save yet another byte 2012-05-26 17:53:07 +02:00
zicodxx 87e9757577 Fixed one more copy/paste issue causeing positional updates relayed to possibly disconnected players 2012-05-26 14:09:03 +02:00
zicodxx 48e9e1dc09 Fit player/player collisions to not take damage from bump while remote player has possibly not aligned to the collision, yet; Added FORCE_DAMAGE_THRESHOLD for minimum force damage to receive from object bumps to not simply take damage from touching objects 2012-05-26 13:28:46 +02:00
zicodxx 1431d3bc35 Cancel out do_controlcen_dead_frame() when not playing and only check triggers for playing players for further host-authority stuff; Made GameProcessFrame not cause endless loop by closing kmatrix over and over again due to game_leave_menus(); Also only close menus when level ends and when we die only the automap will close - otherwise menus can stay (user request) 2012-05-25 12:14:28 +02:00
zicodxx 4554227d1a in StartLevel() only call disable_matcens() and clear_transient_objects() in Singleplayer to keep consistency with remote clients 2012-05-24 12:46:35 +02:00
zicodxx 1296f3e3b3 Introduced quaternion functions to replace vector matrix where size matters - created by Florian Feucht; Added option for pdata packets based on quaternion in Multiplayer game; Removed PF_LEVELLING from new player objects to prevent jittering in player banking 2012-05-21 17:06:50 +02:00
zicodxx 36774e21d5 now properly initialize all other parts of the new/old player object when restoring a coop savestate 2012-05-21 10:33:53 +02:00
zicodxx b38c3a98e7 solved some potential buffer overflows when initializing movie names 2012-05-19 02:37:13 +02:00
zicodxx 66f2045c59 using our own functions for strdup and _splitpath with the d_ prefix for all platforms for consistency 2012-05-19 02:16:43 +02:00
zicodxx 70287bfde6 using our own functions for stricmp, strnicmp, strlwr, strupr, strrev with a d_ prefix for all platforms for consistency 2012-05-19 01:36:43 +02:00
zicodxx ef8c3bc436 fixed incorrect canvase for opengl-scaled savestate thumbnail; rebuild free objects after restoring and remapping the coop players 2012-05-18 10:54:41 +02:00
zicodxx e6841439b0 allow PAUSE key during death sequence to pause or view multiplayer game stats; Also reset hostages_on_board when ship blows up so pause menu during death sequence will show 0 hostages soon as the ship explodes; fixed crash for slew_init by removing old numlock hack 2012-05-16 14:39:31 +02:00
zicodxx 2c5176a336 when updating game info also check for player connected status in case we send to everyone 2012-05-16 10:41:15 +02:00
zicodxx 8699ae6b63 In Multiplayer when taking damage, the game will only leave menus when shield drop below 5 2012-05-16 01:06:16 +02:00
zicodxx 1c8dc35257 Do not allow ports below 1024; More verbosity for udp_open_socket() 2012-05-16 00:59:19 +02:00
zicodxx d472f592a0 Do not send endlevel packets to disconnected (but still saved) clients 2012-05-15 23:39:24 +02:00
zicodxx 2bed74b056 During kmatrix bring up Game_wind againso the host can still follow the game - becomes necessary later with host-authority functions 2012-05-14 19:20:18 +02:00
zicodxx d3fb313fd9 Renamed FixedStepCalc() to cald_d_tick() and FixedStep became d_tick_step; Also ther eonly is a 50ms-timer used to d_tick_step as it was the only one used so far; Replaced FrameCount with d_tick_count which only increments by 50ms-timer used in calc_d_tick() - that now scales timed actions for certain functions properly and makes AI work FPS-independent without any hacks in that regard 2012-05-14 19:06:28 +02:00
zicodxx dbb5eeef35 Made inline functions static 2012-05-14 17:13:27 +02:00
zicodxx 6d3782996c Fixed some non-critical compiler warnings; Now compiling with -std=c99 -pedantic and fixed warnings (except for editor build) caused by this 2012-05-14 12:20:30 +02:00
zicodxx 20b8e59305 Incremented version to 0.57.3; Added Release notes 2012-05-10 19:10:49 +02:00
zicodxx bfef7393d5 Reduced timeout from 10 to 5 seconds 2012-05-10 18:54:22 +02:00
zicodxx 57d3f3b34f Wrote seperate function for weapon autocycling that also cycles through non-autoselect weapons and properly respects super laser; Added option to not autoselect weapon when firing; On the way, smoothed the menu text in misc menu a bit 2012-05-10 14:39:26 +02:00
zicodxx 4eaddede80 Reuse pre-defined player objects when loading coop savestate to revent messup when player amount or orders change in a certain way 2012-05-10 01:40:39 +02:00
zicodxx 1475eccac4 Added more versatility in picking targets for the creation of smart blobs - especially for Multiplayer; cleaned that code a bit; made dodging of homing projectiles a little easier 2012-05-09 01:22:31 +02:00
zicodxx b0f34d2b89 fixed copy/paste mistake 2012-04-30 00:38:45 +02:00
zicodxx 347775de93 Similar to Network_new_game introduced imulti_new_game to exclusivly use in multi.c to execute stuff in new level only when starting a new game - for example resetting player ship inventory which is not supposed to happen on each level 2012-04-27 02:09:48 +02:00
zicodxx 6e0abf59c4 little reorganization for draw_hud(): draw multiplayer names first, reticle last to prevent anything being drawn over by floating names and reticle not messed by anything else 2012-04-24 11:55:16 +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
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 ef2df1225d Rename MessageBox to ui_messagebox to avoid a conflict with Windows' MessageBox 2012-04-17 16:11:42 +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 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 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 1c85ce7848 Finish the game cleanly, closing Game_wind, if Current_level_num is 0 2012-04-17 15:05:43 +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 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 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
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 0011e44087 Fixed set but unused variables in OGL build 2012-04-15 16:15:21 +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 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
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 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
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
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 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 7b6bfa5fc8 Fix crash when playing a level straight from the editor (check if Current_mission has actually been loaded, like the other ex-crash) 2012-04-14 15:18:50 +08:00
Chris Taylor 2ca5303028 Delete-E while playing a level now works properly - it closes Game_wind and sets Cursegp if necessary when going to the editor 2012-04-14 15:09:21 +08:00
Chris Taylor 2ab19658dc Only do an Int3 in write_game_text_file when PHYSFS_close returns 0, which is an error, not when it returns 1 2012-04-14 14:13:01 +08:00
Chris Taylor 8ba0bdc492 Fix crash when loading a level in the editor 2012-04-14 13:34:43 +08:00
zicodxx 2c7a8b419b Removed redundant call of songs_stop_all() when starting credits; Added failsafe for loop in case MHDR_DONE flag is not properly set by MIDI device; Added more verbosity for hmp_reset() 2012-04-12 19:45:45 +02:00
zicodxx f35eba5f04 Fixed some Multiplayer bugs: Reactor invulnerable time did not checked for hours spent in level so reactor would become invulnerable again after 60 minutes; Fixed the fix (heh) for misordered explode/reappear packets; Reset Player_eggs_dropped when initializing new ship so eggs are properly dropped when player disconnects two times without respawning; Cleaned player disconnecting a little bit and made code more straightforward 2012-04-12 02:15:26 +02:00
Chris Taylor 496b40ab35 Fix a crash when going into a directory with no files in the editor file browser, clicking on listboxes for same sets inputbox correctly 2012-04-11 12:05:39 +08:00
Chris Taylor a6e65196b8 Draw the object rotation velocity, file browser and MessageBox dialogs properly 2012-04-11 10:52:57 +08:00
Chris Taylor 785540dd7b Fix unused variable warning in last commit 2012-04-09 20:52:25 +08:00
Chris Taylor e7e034b7bd Editor exits cleanly when clicking the close box, no more redundant gr_uscanline call in gl_urect for ogl (an initial attempt to fix the previous bug) 2012-04-09 20:41:47 +08:00
Chris Taylor e2bf33dbdc No setting the screen mode when calling a newmenu function, so if it shows the 'Save Mine' messagebox in the editor, it won't change the screen resolution and trash everything. (If this causes problems, we can make it use the MessageBox if it's still in the editor, nm_messagebox otherwise) 2012-04-09 19:20:02 +08:00
Chris Taylor fba833f773 Fix all remaining known editor drawing issues. In ogl: get the texture previews to draw, get userbox borders to draw in the right location, properly underline characters in the menus, draw all the borders properly (i.e. no gap), no scaling fonts. Software render: draw userbox borders again. Both: clear the whole status bar, clear to the right edge of the screen. 2012-04-09 17:30:40 +08:00
Chris Taylor 83bc26ff29 Fix a nasty bug where pressing 'Alt' to explore the editor menubar would split the window stack in two, rendering the editor unresponsive 2012-04-09 17:13:11 +08:00
Chris Taylor ea2de8cb44 Get the clock, 'keypad' info, texture choosing page and object choosing page to draw (latter two just show black squares for ogl) 2012-04-09 10:14:10 +08:00
zicodxx bf2a058129 in software rendering scale savestate thumbnail to correct size 2012-04-09 00:19:16 +02:00
zicodxx 091dbd8769 plasma fire can ignite bombs which are dropped while firing. to compensate added a timed check where at least one projectile must be older than 200ms to trigger a possible collision. this fixes this issue if the player is moving away from the bomb 2012-04-08 16:59:51 +02:00
zicodxx 6a4ea459e7 added specification for Descent: Destination Saturn briefing screen to properly show briefings; added different briefing structure for Descent 1 Shareware which has a slightly different order of the usual briefings 2012-04-08 15:47:58 +02:00
zicodxx a22b6aa6ec record shields if player is invulnerable to get proper shield display in demo playback if player respawns with invulnerability on 2012-04-07 16:13:12 +02:00
zicodxx d0ddf0362a fixed glitch when reappear and explode packets are misordered, rendering player invisible 2012-04-07 12:32:22 +02:00
zicodxx d940dcb381 removed redundant definitions of FILENAME_LEN 2012-04-07 11:41:17 +02:00
zicodxx 45e351e46c in choose_drop_segment let fallback correctly check for reactor segment 2012-04-07 10:58:46 +02:00
zicodxx 84a3eb2fac Introduced fixmul64 returning fix64 type to use with check_point_to_face() and prevent fix overflow with very large faces; on the way cleaned up NO_FIX_INLINE remnants and replaced QLONG with fix64 2012-04-05 02:41:59 +02:00
zicodxx 39b0dacd6a variable declarations come first 2012-04-05 02:21:33 +02:00
Chris Taylor fd42ac5cb1 Make the editor draw the same for the non-ogl build as the ogl build, since I just made it draw the grey background over everything in the last commit. If you want to see what it's *supposed* to look like, go to yesterday's commit :P 2012-03-31 20:25:09 +08:00
Chris Taylor cb86ece872 Use correct coordinates for dialog border (still doesn't draw fully) 2012-03-31 19:55:39 +08:00
Chris Taylor b937b4e409 Make the main stuff (gadgets, two viewers) draw for the editor in ogl, still more tweaking required 2012-03-31 18:36:07 +08:00
Chris Taylor a6502d4471 Complete previous change (whoops) 2012-03-31 12:38:14 +08:00
Chris Taylor 8a250ad48a Make all drawing in the editor single buffered, since the whole screen is double buffered. Fixes crash - but only shows a black screen and the menu for ogl 2012-03-31 12:28:01 +08:00
Chris Taylor 2062876912 Make sure the ogl font code recognises the editor font is fixed width, fixing a crash; take the plunge and make D2X Rebirth compile with editor for Mac OpenGL build (won't work yet) 2012-03-31 11:47:38 +08:00
zicodxx b65f0e6d33 Changed declaration of event_get_idle_second() from int32_t to fix since Windows does not know it without pstypes.h. Included maths.h for this but should now work flawlessly on all platforms 2012-03-30 16:29:11 +02:00