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
6e7462134e
Print builddir into platform banner
2013-08-27 02:45:31 +00:00
Kp
16039a3f99
Remove unused extern global hitobj_list
2013-08-27 02:44:09 +00:00
Kp
20fdaa3fa7
Remove duplicate object addition in SConstruct
2013-08-27 02:43:27 +00:00
Kp
1abcfcb844
Add sanity check that DiskBitmapHeader is the right size
...
This would have caught the -mms-bitfields bug at build time.
2013-08-25 17:16:41 +00:00
Kp
5bafa16e7f
Fix level load hang on >=mingw32-gcc-4.7
...
Starting in gcc 4.7 "Windows mingw targets are using the -mms-bitfields
option by default." <http://gcc.gnu.org/gcc-4.7/changes.html >. This
causes __attribute__((packed)) not to be effective on structures that
are used to express the layout of on-disk data. In turn, that causes
piggy.c to mishandle texture loads, eventually resulting in an infinite
loop. Add a pragma pack to force the headers to pack tightly on
Windows.
2013-08-25 17:16:41 +00:00
Kp
af52e78a50
Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp
2013-08-24 17:10:35 +00:00
Kp
897023eda5
Reorder vertex render lookups to simplify merge
2013-08-24 17:10:06 +00:00
Kp
3f0f68e862
Remove unused move_object_to_goal
2013-08-24 16:54:28 +00:00
Kp
e8776caf16
Remove unused get_random_child
2013-08-24 16:54:28 +00:00
Kp
0365b3600f
Remove unused special_object_in_seg
2013-08-24 16:54:28 +00:00
Kp
335c56111b
Remove unused move_object_to_legal_spot
2013-08-24 16:54:28 +00:00
Kp
b1b40bfe99
Remove unused set_rotvel_and_saturate
2013-08-24 16:54:28 +00:00
Kp
1b44fe5844
Move alpha blend test to helper to simplify merge
2013-08-24 16:44:30 +00:00
Kp
828ced10a5
Declare newdemo_count_demos for D2 menu system
2013-08-24 16:44:30 +00:00
Kp
afcbfe8e54
Rename d1x/d2x variables to unify names between D1X and D2X
2013-08-24 16:44:30 +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
045082f3eb
Use static const fix Flash_rate
2013-08-20 03:02:30 +00:00
Kp
00381b2652
Abstract out weapon names
2013-08-20 02:59:09 +00:00
Kp
9c0be7cdfa
Remove unused kconfig globals
2013-08-20 02:58:51 +00:00
Kp
b3e2c99b17
Use MALLOC for ogl_init_pixel_buffers
2013-08-20 02:58:15 +00:00
Kp
948e03dcbf
Copy mission parameters properly so that D1 missions load
...
Copying unrelated structures with an undocumented assumption that one is
a prefix of the other is dangerous and broken. Remove it and copy the
relevant fields explicitly.
2013-08-18 21:05:31 +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
e86a9b67a6
Move multi.c variables to top of file
2013-08-11 23:03:40 +00:00
Kp
ad6a7820cf
Make PowerupAdjustMapping static const
2013-08-11 22:42:51 +00:00
Kp
82dc40c891
Remove unused prototypes
2013-08-11 20:46:53 +00:00
Kp
69b3618961
Make vm_angvec_zero a static inline function
2013-08-11 20:46:53 +00:00
Kp
6b4ca09376
Split out anarchy object deletion predicate to simplify merge
2013-08-11 20:46:52 +00:00
Kp
743dd2f964
Rearrange code to simplify merge with D1X
2013-08-11 20:46:52 +00:00
Kp
836aa10f8c
Use macro PUT_WEAPON_FLAGS to hide differences in D1X vs D2X
...
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
2013-08-11 20:46:52 +00:00
Kp
d55054d82e
Always play a sound when a player escapes the mine
2013-08-11 20:46:52 +00:00
Kp
431282fd7b
Remove redundant Game_mode guard on multi_strip_robots
2013-08-11 20:46:52 +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
202755e8e3
Use macro GET_WEAPON_FLAGS to hide differences in D1X vs D2X
...
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
2013-08-11 20:46:52 +00:00
Kp
5ef0358a4b
Remove unnecessary int casts in multi buffer parsing
2013-08-11 20:46:52 +00:00
Kp
3226a57848
Remove unused MULTI_ACTIVE_DOOR
2013-08-11 20:43:08 +00:00
Kp
de6422d58f
Remove unused multi_send_audio_taunt
2013-08-11 20:43:08 +00:00
Kp
6e88008677
Use unaligned-safe copy of powerup position
2013-08-11 20:43:08 +00:00
Kp
760667eb60
Remove unused multi_set_robot_ai
2013-08-11 20:43:08 +00:00
Kp
91928c2afc
Rename 'new' to 'n' for C++ compatibility
2013-08-11 20:43:08 +00:00
Kp
afd2f5aea1
Remove unused GET/PUT_INTEL_INT64
2013-08-11 20:40:24 +00:00
Kp
85dc42189b
Add extent to RankStrings to match D2X
2013-08-11 15:11:45 +00:00
Kp
7042815795
Remove OLDPOWCAP code
2013-08-10 23:01:28 +00:00