zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

This one is for Hendricks

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7223 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-11-18 18:13:25 +00:00
parent 279bdca726
commit 1cbdb901bd
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/build/include/baselayer.h
View file

@ -124,7 +124,7 @@ extern struct glinfo_t glinfo;
#endif #endif
vec2_t CONSTEXPR const g_defaultVideoModes [] vec2_t CONSTEXPR const g_defaultVideoModes []
={ { 2560, 1440 }, { 2560, 1200 }, { 2560, 1080 }, { 1920, 1440 }, { 1920, 1200 }, { 1920, 1080 }, { 1680, 1050 }, = { { 2560, 1440 }, { 2560, 1200 }, { 2560, 1080 }, { 1920, 1440 }, { 1920, 1200 }, { 1920, 1080 }, { 1680, 1050 },
{ 1600, 1200 }, { 1600, 900 }, { 1366, 768 }, { 1280, 1024 }, { 1280, 960 }, { 1280, 720 }, { 1152, 864 }, { 1600, 1200 }, { 1600, 900 }, { 1366, 768 }, { 1280, 1024 }, { 1280, 960 }, { 1280, 720 }, { 1152, 864 },
{ 1024, 768 }, { 1024, 600 }, { 800, 600 }, { 640, 480 }, { 640, 400 }, { 512, 384 }, { 480, 360 }, { 1024, 768 }, { 1024, 600 }, { 800, 600 }, { 640, 480 }, { 640, 400 }, { 512, 384 }, { 480, 360 },
{ 400, 300 }, { 320, 240 }, { 320, 200 }, { 0, 0 } }; { 400, 300 }, { 320, 240 }, { 320, 200 }, { 0, 0 } };
@ -135,7 +135,7 @@ extern char inputdevices;
#define NUMKEYS 256 #define NUMKEYS 256
#define KEYFIFOSIZ 64 #define KEYFIFOSIZ 64
char CONSTEXPR const g_keyAsciiTable[128] ={ char CONSTEXPR const g_keyAsciiTable[128] = {
0 , 0, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0, 0, 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', 0 , 0, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0, 0, 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p',
'[', ']', 0, 0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', 39, '`', 0, 92, 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '[', ']', 0, 0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', 39, '`', 0, 92, 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',',
'.', '/', 0, '*', 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '.', '/', 0, '*', 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6',

8
source/build/src/build.cpp
View file

@ -3357,7 +3357,7 @@ void overheadeditor(void)
int32_t resetsynctics = 0, lasttick=timerGetTicks(), waitdelay=totalclock, lastdraw=timerGetTicks(); int32_t resetsynctics = 0, lasttick=timerGetTicks(), waitdelay=totalclock, lastdraw=timerGetTicks();
int32_t olen[2] = {0, 0}, dragwall[2] = {-1, -1}; int32_t olen[2] = {0, 0}, dragwall[2] = {-1, -1};
int16_t linehighlight2 = -1; int16_t linehighlight2 = -1;
vec2_t highlight1 ={ 0, 0 }, highlight2 ={ 0, 0 }; vec2_t highlight1 = { 0, 0 }, highlight2 = { 0, 0 };
ovh.suckwall = -1; ovh.suckwall = -1;
ovh.split = 0; ovh.split = 0;
@ -4449,7 +4449,7 @@ rotate_hlsect_out:
////////// YAX ////////// ////////// YAX //////////
static const char *cfs[2] = {"ceiling", "floor"}; static const char *cfs[2] = {"ceiling", "floor"};
int32_t cf, thez, ulz[2]={0,0}; int32_t cf, thez, ulz[2] = {0,0};
int16_t bn, sandwichbunch=-1; int16_t bn, sandwichbunch=-1;
if (numyaxbunches==YAX_MAXBUNCHES) if (numyaxbunches==YAX_MAXBUNCHES)
@ -5223,7 +5223,7 @@ end_yax: ;
int16_t ignore, refsect; int16_t ignore, refsect;
int32_t n; int32_t n;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int16_t refsectbn[2]={-1,-1}; int16_t refsectbn[2] = {-1,-1};
int32_t refextcf=-1; int32_t refextcf=-1;
#endif #endif
Bmemset(visited, 0, sizeof(visited)); Bmemset(visited, 0, sizeof(visited));
@ -6082,7 +6082,7 @@ end_point_dragging:
{ {
// [component][ceiling(0) or floor(1)] // [component][ceiling(0) or floor(1)]
// compstat: &1: "has extension", &2: "differ in z", &4: "sloped", -1: "uninited" // compstat: &1: "has extension", &2: "differ in z", &4: "sloped", -1: "uninited"
int32_t cf, comp, compstat[2][2]={{-1,-1},{-1,-1}}, compcfz[2][2]; int32_t cf, comp, compstat[2][2] = {{-1,-1},{-1,-1}}, compcfz[2][2];
// joinstat: join what to what? // joinstat: join what to what?
// &1: ceil(comp 0) <-> flor(comp 1), &2: flor(comp 0) <-> ceil(comp 1) // &1: ceil(comp 0) <-> flor(comp 1), &2: flor(comp 0) <-> ceil(comp 1)

2
source/duke3d/src/actors.cpp
View file

@ -179,7 +179,7 @@ SKIPWALLCHECK:
// this is really weird // this is really weird
int32_t const zRand = -ZOFFSET2 + (krand()&(ZOFFSET5-1)); int32_t const zRand = -ZOFFSET2 + (krand()&(ZOFFSET5-1));
static const uint8_t statnumList [] ={ static const uint8_t statnumList [] = {
STAT_DEFAULT, STAT_ACTOR, STAT_STANDABLE, STAT_DEFAULT, STAT_ACTOR, STAT_STANDABLE,
STAT_PLAYER, STAT_FALLER, STAT_ZOMBIEACTOR, STAT_MISC STAT_PLAYER, STAT_FALLER, STAT_ZOMBIEACTOR, STAT_MISC
}; };