Commit graph

297 commits

Author SHA1 Message Date
Kp 3ef32b16f5 Move similar/arch/sdl/init.c -> similar/arch/sdl/init.cpp 2013-10-01 02:53:25 +00:00
Kp bc7429c912 Move similar/arch/sdl/event.c -> similar/arch/sdl/event.cpp 2013-10-01 02:53:25 +00:00
Kp 37b37aa08b Move similar/arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.cpp 2013-10-01 02:53:25 +00:00
Kp e2b7b802e3 Move similar/arch/sdl/digi.c -> similar/arch/sdl/digi.cpp 2013-10-01 02:53:23 +00:00
Kp 4863c42c9d Move similar/3d/interp.c -> similar/3d/interp.cpp 2013-10-01 02:53:09 +00:00
Kp 4d026f8b69 Move similar/2d/pcx.c -> similar/2d/pcx.cpp 2013-10-01 02:53:09 +00:00
Kp f4c25c4e9a Move similar/2d/palette.c -> similar/2d/palette.cpp 2013-10-01 02:53:09 +00:00
Kp 381c2e0781 Move similar/2d/font.c -> similar/2d/font.cpp 2013-10-01 02:53:09 +00:00
Kp fce2717e83 Move similar/arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.cpp 2013-10-01 02:53:09 +00:00
Kp ace3238790 Move similar/arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.cpp 2013-10-01 02:53:09 +00:00
Kp 64c7bc80f0 Move similar/arch/sdl/gr.c -> similar/arch/sdl/gr.cpp 2013-10-01 02:53:09 +00:00
Kp 91f6d5e72d Move game_init_render_buffers inline 2013-09-28 23:51:52 +00:00
Kp bca4a99f3e Move */main/laser.c -> similar/main/laser.c 2013-09-21 23:19:38 +00:00
Kp 9e3fb796e1 Use helper for comparing to proximity bomb index 2013-09-21 23:19:38 +00:00
Kp 9210a3870e Remove unused fields in struct player 2013-09-21 18:04:10 +00:00
Kp 7e6278bb0a D2X also needs the workaround for do_weapon_select 2013-09-21 18:01:45 +00:00
Kp f4b21088a0 Track vulcan ammo explicitly 2013-09-20 23:12:54 +00:00
Kp 6e1d9f1f0c Add helper to test for weapons that use vulcan ammo 2013-09-20 23:12:51 +00:00
Kp 173a3febc9 Enable -Wpointer-arith 2013-09-15 21:39:18 +00:00
Kp d447d02a1d Move */main/newdemo.c -> similar/main/newdemo.c 2013-09-15 21:34:08 +00:00
Kp aa9127e3c1 Enable -Wwrite-strings 2013-09-15 21:34:03 +00:00
Kp ef218b7665 Simplify pilot deletion 2013-09-15 21:34:03 +00:00
Kp d52a930cab Store pointer to customized demo text out of line 2013-09-15 21:01:30 +00:00
Kp c3bbc41796 Remove !defined(NETWORK) code
Rebirth has always defined NETWORK, so checking for it clutters the code.
2013-09-15 21:01:06 +00:00
Kp b7db46a43a Switch to std::min 2013-09-15 04:06:07 +00:00
Kp d858932187 Remove unused parameter in call to slew_stop 2013-09-11 02:41:38 +00:00
Kp 316e71c96c Simplify Toggle_var 2013-09-11 02:41:38 +00:00
Kp 88403fbfd8 Remove defined(SHAREWARE) code
Rebirth supports shareware and retail data based on runtime decisions.
2013-09-11 02:39:50 +00:00
Kp c509faf0f7 Cache weapon order value 2013-09-11 02:29:29 +00:00
Kp 7a2c9ea021 Remove useless menu text change 2013-09-07 16:35:03 +00:00
Kp d4e4a34be7 Remove obsolete descent_critical_error variables
These appear to be for reporting serious errors from DOS.  Commit
1de5349 removed the ability to set them to anything other than 0, so
remove them.
2013-09-02 23:59:31 +00:00
Kp 243f8cdd36 Simplify D1X SPREADFIRE truncation 2013-09-02 23:59:31 +00:00
Kp d165b9c422 Make briefing->message const 2013-09-02 23:59:31 +00:00
Kp d156a4c1ab Simplify D1X hostage handling 2013-09-02 23:59:31 +00:00
Kp c8f0c799b7 Use helper for setting menu items to type number 2013-09-01 23:50:55 +00:00
Kp 4fe618b325 Use helper for setting menu items to type slider 2013-09-01 23:50:55 +00:00
Kp 0645e96e17 Use helper for setting menu items to type radio 2013-09-01 23:50:54 +00:00
Kp 4c5eaded8d Use helper for setting menu items to type checkbox 2013-09-01 23:23:55 +00:00
Kp bb8b229dc2 Use helper for setting menu items to type input 2013-09-01 23:23:55 +00:00
Kp b7dac2941c Move */main/gamesave.c -> similar/main/gamesave.c 2013-09-01 22:59:55 +00:00
Kp ce2dd25e3f Use helper for setting menu items to types menu and text 2013-09-01 22:24:13 +00:00
Kp a15996a761 Format maximum starting level once 2013-09-01 22:22:12 +00:00
Kp 6768c9bd6c Reduce wasted space in briefing_screen struct 2013-09-01 22:19:33 +00:00
Kp bf027e3df0 Move */main/titles.c -> similar/main/titles.c 2013-09-01 22:19:27 +00:00
Kp 801dfbcd81 Move */main/net_udp.c -> similar/main/net_udp.c 2013-09-01 21:51:54 +00:00
Kp 9d2d8bb552 Scrub netgame flags on load/save/send/recv 2013-09-01 21:09:01 +00:00
Kp 923c2111de Move */main/switch.c -> similar/main/switch.c 2013-09-01 18:42:31 +00:00
Kp 25b7735e44 Move */main/aipath.c -> similar/main/aipath.c 2013-09-01 18:38:37 +00:00
Kp 3554d17614 Move */main/render.c -> similar/main/render.c 2013-09-01 18:22:55 +00:00
Kp f131fcd3da Move */main/menu.c -> similar/main/menu.c 2013-09-01 18:06:24 +00:00
Kp 1fd1aa05bc Move */main/mission.c -> similar/main/mission.c 2013-09-01 17:43:27 +00:00
Kp 24bbd2a76d Move */main/automap.c -> similar/main/automap.c 2013-09-01 17:37:38 +00:00
Kp b77c7fe357 Mark kconfig functions static 2013-09-01 17:20:08 +00:00
Kp 7bf5b29be4 Move */main/kconfig.c -> similar/main/kconfig.c 2013-09-01 17:20:07 +00:00
Kp e23035e61f Move Last_afterburner_time into laser_info 2013-08-31 17:17:35 +00:00
Kp 4b6bd54e7d Simplify text decoding 2013-08-31 16:45:43 +00:00
Kp 567b1d13c2 Remove broken COMPACT_SEGS code
It has not built since at least 0c36fecb.
2013-08-31 16:45:43 +00:00
zico 267f560a66 merge 2013-08-30 23:06:19 +02:00
Kp 6be4dc01c5 Pass non-const string to putenv 2013-08-29 22:52:30 +00:00
Kp af52e78a50 Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp 2013-08-24 17:10:35 +00:00
Kp d909692148 Allow compiler to unroll pow2ize 2013-08-24 16:44:23 +00:00
Kp 20cf3f4cdb Mark various OGL functions static 2013-08-24 16:44:23 +00:00
Kp 8ef8371563 Use unsigned screen width/height 2013-08-24 16:44:23 +00:00
Kp b3e2c99b17 Use MALLOC for ogl_init_pixel_buffers 2013-08-20 02:58:15 +00:00
zico ef23b7a571 Updated copyright 2013-08-17 02:16:49 +02:00
zico aec1f1b808 In update_cockpits() only page-in cockpit bitmap if in a mode which actually has one 2013-08-17 01:07:08 +02:00
zico 31e617c1a0 Made Palette[Red,Green,Blue]Add scaled to game brightness setting before applying to gr_palette_step_up. Also used real timers to diminish palette instead of intervals choosen by d_rand() 2013-08-17 00:54:17 +02:00
Kp a04cd57d71 Move */main/multi.c -> similar/main/multi.c 2013-08-11 23:46:13 +00:00
Kp 8d13642c9f Hide GM_CAPTURE tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 0c3adc48df Hide GM_HOARD tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 4e6142d779 Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp 2013-08-10 03:56:14 +00:00
Kp e750c90b00 Mark more math as const correct 2013-08-10 03:55:50 +00:00
Kp bca0dacc98 Merge branch d2x-rebirth/master into unification/master
Conflicts:
	SConstruct
2013-08-09 22:53:45 +00:00
Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master
Conflicts:
	SConstruct
	common/main/multi.h
	similar/main/gamerend.c
2013-08-09 22:49:04 +00:00
zico 830bcd7845 merge with ccea6b3547 2013-08-09 17:25:42 +02:00
zico a527348681 Added MULTI_FIRE_BOMB as alteration of MULTI_FIRE to keep bombs mapped in a Multiplayer match for later Host authority and to make their chaff ability work correctly. Additionally added MULTI_FIRE_TRACK to only send Network_laser_track if > -1. On the way I made laser.c a bit more similar between D1X and D2X 2013-08-09 17:21:03 +02:00
Kp 2cc0068fa9 Move */main/fvi.c -> similar/main/fvi.c 2013-08-09 03:13:33 +00:00
Kp 2cd7748e93 Convert vsprintf to vsnprintf 2013-08-09 01:58:17 +00:00
zico 40c5f10e20 Added definition of DESIGNATED_GAME_FPS as 30 and DESIGNATED_GAME_FRAMETIME based on the former. We use those for d_tick_count intervals and to scale other parts that have never been properly aligned to FrameTime before. In that regard, Release builds will take DESIGNATED_GAME_FPS as MINIMUM_FPS for -maxfps argument 2013-08-08 22:07:29 +02:00
Kp a881ee455e Remove fix.h 2013-08-08 03:01:48 +00:00
Kp b624684ba5 Switch gr_printf(x,y,"%s",s) to gr_string(x,y,s) 2013-08-08 03:01:47 +00:00
Kp 400b18b78a Mark gauges variables const 2013-08-08 03:01:47 +00:00
Kp 9cb88f4db6 Store weapon_name as const char* 2013-08-08 03:01:47 +00:00
Kp e23a06fb4f Drop worthless font zeroing
BSS is initialized to zero.  Explicitly zeroing it again wastes time and
space.
2013-08-08 03:01:47 +00:00
zico bbaa3c21f3 HAMERS! Wait 33ms between each turn of a homing missile projectile, only scale turns if FPS are below 30 2013-08-08 00:29:56 +02:00
Kp f31f74c2e6 Add realloc cast to gr_set_mode 2013-08-07 02:39:43 +00:00
Kp b81100d54d Make OGL_VIEWPORT static inline 2013-08-07 02:39:43 +00:00
Kp 1b7c9734ad Pass unsigned dimensions to write_bmp 2013-08-07 02:39:43 +00:00
Kp 924cc78c43 Use MALLOC for save_screen_shot 2013-08-07 02:39:43 +00:00
Kp 4c3703c31c Remove unused function johns_obj_unlink 2013-08-07 02:33:19 +00:00
Kp 6a53581b55 Remove unused function is_object_in_seg 2013-08-07 02:33:19 +00:00
Kp 021fc26b77 Remove unused function remove_all_objects_but 2013-08-07 02:33:19 +00:00
Kp a39c44b6fd Remove unused function search_all_segments_for_object 2013-08-07 02:33:19 +00:00
Kp 98224892c5 Remove unused function expand_row 2013-08-07 02:33:19 +00:00
Kp 22d006f525 Remove unused function tex_format_supported 2013-08-07 02:33:19 +00:00
Kp bc8f302b40 Remove unused function on_seismic_level 2013-08-07 02:33:19 +00:00
Kp 84383deea2 Remove unused function wall_reset 2013-08-07 02:33:19 +00:00
Kp cd5bb27ff1 Remove unused function list_seg_objects 2013-08-07 02:33:19 +00:00
Kp b2305d4ab3 Remove unused function check_duplicate_objects 2013-08-07 02:33:19 +00:00
Kp d02daa44fa Remove unused function remove_incorrect_objects 2013-08-07 02:33:19 +00:00