zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 11:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Split r3159..r3161, part 14: The rest.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3180 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-11-15 14:28:47 +00:00
parent 6144a2e18c
commit 6547495cac
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/build/include/compat.h
View file

@ -20,6 +20,13 @@
# define ATTRIBUTE(attrlist) # define ATTRIBUTE(attrlist)
#endif #endif
#ifndef min
#define min(x,y) ((x) < (y) ? (x) : (y))
#endif
#ifndef max
#define max(x,y) ((x) > (y) ? (x) : (y))
#endif
// This gives us access to 'intptr_t' and 'uintptr_t', which are // This gives us access to 'intptr_t' and 'uintptr_t', which are
// abstractions to the size of a pointer on a given platform // abstractions to the size of a pointer on a given platform
// (ie, they're guaranteed to be the same size as a pointer) // (ie, they're guaranteed to be the same size as a pointer)

2
polymer/eduke32/source/game.c
View file

@ -10405,7 +10405,7 @@ int32_t app_main(int32_t argc, const char **argv)
if (g_networkMode != NET_DEDICATED_SERVER) if (g_networkMode != NET_DEDICATED_SERVER)
{ {
if (CONTROL_Startup(1, &GetTime, TICRATE)) if (CONTROL_Startup(controltype_keyboardandmouse, &GetTime, TICRATE))
{ {
ERRprintf("There was an error initializing the CONTROL system.\n"); ERRprintf("There was an error initializing the CONTROL system.\n");
uninitengine(); uninitengine();

2
polymer/eduke32/source/mapster32.h
View file

@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//#define NUMOPTIONS 9 //#define NUMOPTIONS 9
//char option[NUMOPTIONS] = {0,0,0,0,0,0,1,0,0}; //char option[NUMOPTIONS] = {0,0,0,0,0,0,1,0,0};
uint8_t default_buildkeys[NUMBUILDKEYS] = char default_buildkeys[NUMBUILDKEYS] =
{ {
0xc8,0xd0,0xcb,0xcd,0x2a,0x9d,0x1d,0x39, 0xc8,0xd0,0xcb,0xcd,0x2a,0x9d,0x1d,0x39,
0x1e,0x2c,0xd1,0xc9,0x47,0x49, 0x1e,0x2c,0xd1,0xc9,0x47,0x49,

4
polymer/eduke32/source/menus.c
View file

@ -661,7 +661,7 @@ static void M_DrawBackground(void)
} }
static void M_DrawTopBar(char *caption) static void M_DrawTopBar(const char *caption)
{ {
rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,caption); menutext(160,24,0,0,caption);
@ -2669,7 +2669,7 @@ cheat_for_port_credits2:
#ifdef POLYMER #ifdef POLYMER
else else
{ {
float ratios[] = { 0.0, 1.33, 1.66, 1.78, 1.85, 2.35 }; double ratios[] = { 0.0, 1.33, 1.66, 1.78, 1.85, 2.35 };
int32_t j = (sizeof(ratios)/sizeof(ratios[0])); int32_t j = (sizeof(ratios)/sizeof(ratios[0]));

2
polymer/eduke32/source/savegame.c
View file

@ -627,7 +627,7 @@ static void docmpsd(const void *ptr, void *dump, uint32_t size, uint32_t cnt, ui
{ \ { \
if (*p!=*op) \ if (*p!=*op) \
{ \ { \
*op = *p; \ *op = *p; \
VAL(Idxbits, retdiff) = i; \ VAL(Idxbits, retdiff) = i; \
retdiff += BYTES(Idxbits); \ retdiff += BYTES(Idxbits); \
VAL(Datbits, retdiff) = *p; \ VAL(Datbits, retdiff) = *p; \