Kp
9f04c0c3d8
Make OGL_ENABLE safe for single statement blocks
2015-04-02 02:36:54 +00:00
Kp
6a4c7ed78e
Inline away D1 secret_restore values
2015-04-02 02:36:53 +00:00
Kp
face692126
Narrow D2 previous_visibility to uint8_t
2015-04-02 02:36:53 +00:00
Kp
6757b2178b
Narrow D2 rapidfire_count to uint8_t
2015-04-02 02:36:53 +00:00
Kp
bb10d350f4
Narrow D2 consecutive_retries to uint8_t
2015-04-02 02:36:53 +00:00
Kp
a36603826a
Narrow D2 retry_count to uint8_t
2015-04-02 02:36:53 +00:00
Kp
9157e5f970
Use enum class for player_awareness_type_t
2015-04-02 02:36:53 +00:00
Kp
90fbebf8fd
Convert most global arrays to array<>
2015-04-02 02:36:52 +00:00
Kp
66a70fd373
Prepare for global arrays to be array<>
2015-04-02 02:36:52 +00:00
Kp
6e96ff3e00
Fix ambiguous use of INTEL_SHORT/INTEL_INT
2015-04-02 02:36:52 +00:00
Kp
92b6cd3883
Replace ui_create_dialog specialization with helper
...
Rename ui_create_dialog<void *> specialization with free function
untyped_ui_create_dialog. GCC 4.6 incorrectly considers a
specialization to be a redundant declaration, causing a
-Wredundant-decls failure with the specialization form.
Fixes: be041a9cfc
("Add type checking for ui_create_dialog")
2015-04-02 02:36:52 +00:00
Kp
598a5e42a2
Allow granting items at player spawn
2015-03-28 17:18:02 +00:00
Kp
da3cb31a0e
Refactor powerup allow code
2015-03-28 17:18:02 +00:00
Kp
b32d1c76c9
Move powerup size reset into set_powerup_id
2015-03-28 17:18:02 +00:00
Kp
12ad357b8d
Move Wimp Menu to macro
2015-03-28 17:18:02 +00:00
Kp
0b20dea0ad
Remove unused jukebox functions
2015-03-28 17:18:02 +00:00
Kp
c4bcbb0403
Add workaround for gcc 4.6 constructor brace initialization
...
Reported-by: btb <https://github.com/dxx-rebirth/dxx-rebirth/pull/54#issuecomment-86252358 >
2015-03-27 02:50:23 +00:00
Kp
7045b44386
Move operator*(vm_distance,vm_distance) into class scope
...
clang -Wunused-function warns about a 'static constexpr' function
defined in a header if the header is ever included in a file which does
not call the function. Move the function into class scope to silence
the warning and prevent the compiler from considering it when resolving
operator*(T1,T2).
Reported-by: btb <https://github.com/dxx-rebirth/dxx-rebirth/pull/54#issuecomment-86252750 >
2015-03-26 02:42:26 +00:00
Kp
ff83ba95b6
Remove unused ogl_extensions_init return value
2015-03-25 01:59:21 +00:00
Kp
694c522756
Use array<> for OpenGL extension version
2015-03-25 01:59:20 +00:00
Christian
97fc714970
Merge pull request #53 from derhass/unification/syncgl
...
cleaned-up syncgl patch for unification
2015-03-24 12:37:55 +01:00
Kp
0707664ae1
Use enum for kmatrix_view result
2015-03-24 02:07:42 +00:00
derhass
639b569496
Merge branch 'unification/master' into unification/syncgl_v2
...
Conflicts:
similar/arch/ogl/gr.cpp
similar/misc/args.cpp
2015-03-23 20:18:17 +01:00
derhass
bf723efd48
use C++ style reinterpret_casts to pointers from SDL_GetProcAddress to function pointer types
2015-03-23 20:06:23 +01:00
zico
8d686ab23b
implemented return value for kmatrix_view() so we can properly bail out of the game loop in AdvanceLevel()
2015-03-23 03:03:22 +01:00
Kp
d63be36fb3
Fix bogus trap on remote_owner check
...
Some call sites pass a uint8_t to objnum_remote_to_local, which is
zero-extended up to an int. The check for owner==-1 then fails, causing
the sanity check to trap to the debugger, even though the situation is
normal and harmless. Switch the type to int8_t to ensure that the value
is not sign/zero-extended.
2015-03-22 22:48:47 +00:00
derhass
6d41224638
move GL synchronization code into its own class
2015-03-22 21:19:06 +01:00
derhass
db267af6f2
add basic OpenGL extension handling
...
Currently only used for fence sync objects.
2015-03-22 20:32:14 +01:00
Kp
d04e7902ee
Make file_get*list static
2015-03-22 18:49:21 +00:00
Kp
383e7703b6
Use ntstring in file_getdirlist
2015-03-22 18:49:21 +00:00
Kp
2b44a352ca
Remove redundant sc_mode
...
sc_mode is a packed copy of sc_w/sc_h. Switch to an accessor that uses
the copy.
2015-03-22 18:49:21 +00:00
Kp
fca381727c
Add wrappers for screen width/height
2015-03-22 18:49:21 +00:00
Kp
8daa014d53
Remove unused gr_check_mode
2015-03-22 18:49:21 +00:00
Kp
f098471e54
Make sdl_video_flags static
2015-03-22 18:49:21 +00:00
Kp
91d31b1952
Wrap object signature in subtype
2015-03-22 18:49:21 +00:00
Kp
08c0c3768c
Remove unused gr_set_draw_buffer
2015-03-22 18:49:21 +00:00
Kp
ce028fc843
Move Object_type_names to dumpmine
2015-03-22 18:49:21 +00:00
Kp
7840885473
Fix clang -Wparentheses-equality warnings
2015-03-22 18:49:21 +00:00
Kp
7bf49fe551
Fix clang -Wmissing-braces warnings
2015-03-22 18:49:21 +00:00
Kp
08f6ad4bc7
Enable nested INI files
2015-03-22 18:49:21 +00:00
Kp
9ddea5f570
Reduce lifetime of Args
2015-03-22 18:49:20 +00:00
Kp
65ff319ebb
Use ntstring for LastMission
2015-03-22 18:49:20 +00:00
Kp
af7b08abac
Convert some GameCfg flags to bool
2015-03-22 18:49:20 +00:00
derhass
2cd73b6dfe
Import the syncgl patch based on 0.58.1 into unification code base
...
I also changed the command line arguments a bit, gl_syncmethod and
gl_sycnwait are used now. Furthermore, I added the ew mode AUTO. This is
a conservative mode and the default for now: if GL_ARB_sync is available,
use the FENCE_SLEEP mode, otherwise, disable it completely.
Conflicts:
include/args.h
misc/args.c
similar/arch/ogl/gr.cpp
2015-03-22 18:17:11 +01:00
Kp
3da8a85ec3
Remove constexpr on rgb_array_wrapper::operator[]
...
OS X clang (but not Linux clang) rejects constexpr
on rgb_array_wrapper::operator[].
Reported-by: btb <b414758505 (commitcomment-10330686)
>
Fixes: b414758505
("Add stub for player color remapping")
2015-03-21 21:11:12 +00:00
Matt Vandermeulen
a59daa64c6
ಠ_ಠ
2015-03-20 17:31:22 -04:00
Kp
3a37b41192
Fix startup trap with D1 shareware data
...
D1 shareware models handle textures in a way that requires starting
highest_texture_num at -1.
Reported-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/issues/46 >
Fixes: 68be3baeca
("Track highest_texture_num locally")
2015-03-20 03:30:20 +00:00
Kp
69af920e09
Fix Win64 startup crash
...
Fixes: 5bafa16e7f
("Fix level load hang on >=mingw32-gcc-4.7")
2015-03-19 02:31:22 +00:00
Kp
e1ff8afc88
Use ntstring for newmenu_item saved_text
2015-03-12 02:21:21 +00:00
Kp
d1b60c2324
Pass uint_fast32_t for newmenu_* items
2015-03-12 02:21:21 +00:00