Abolish all " ={ " when assigning a struct. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@6061 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-02-05 20:58:33 +00:00
parent 5d77a4ac06
commit d43fb548cf
17 changed files with 67 additions and 67 deletions

View file

@ -250,7 +250,7 @@ int32_t drawline16(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int col)
//int32_t odx,ody; //int32_t odx,ody;
//int32_t ox1=x1,oy1=y1, ox2=x2,oy2=y2; //int32_t ox1=x1,oy1=y1, ox2=x2,oy2=y2;
vec2_t d ={ x2-x1, y2-y1 }; vec2_t d = { x2-x1, y2-y1 };
//odx=dx; //odx=dx;
//ody=dy; //ody=dy;
@ -580,7 +580,7 @@ int32_t scalescreeny(int32_t sy) { return (m32_sideview) ? mulscale14(sy, m32_si
// return screen coordinates for BUILD coords x and y (relative to current position) // return screen coordinates for BUILD coords x and y (relative to current position)
void screencoords(int32_t *xres, int32_t *yres, int32_t x, int32_t y, int32_t zoome) void screencoords(int32_t *xres, int32_t *yres, int32_t x, int32_t y, int32_t zoome)
{ {
vec2_t coord ={ x, y }; vec2_t coord = { x, y };
if (m32_sideview) if (m32_sideview)
rotatepoint(zerovec, coord, m32_sideang, &coord); rotatepoint(zerovec, coord, m32_sideang, &coord);
@ -609,7 +609,7 @@ int32_t getinvdisplacement(int32_t *dx, int32_t *dy, int32_t dz)
dz = (((int64_t) dz * (int64_t) m32_sidecos)/(int64_t) m32_sidesin)>>4; dz = (((int64_t) dz * (int64_t) m32_sidecos)/(int64_t) m32_sidesin)>>4;
vec2_t v[2] ={ { 0, dz },{ *dx, *dy } }; vec2_t v[2] = { { 0, dz },{ *dx, *dy } };
rotatepoint(zerovec, v[0], -m32_sideang, &v[1]); rotatepoint(zerovec, v[0], -m32_sideang, &v[1]);

View file

@ -69,9 +69,9 @@ void hlineasm4(bssize_t cnt, int32_t skiploadincs, int32_t paloffs, uint32_t by,
const char *const A_C_RESTRICT palptr = &ghlinepal[paloffs]; const char *const A_C_RESTRICT palptr = &ghlinepal[paloffs];
const char *const A_C_RESTRICT buf = gbuf; const char *const A_C_RESTRICT buf = gbuf;
const vec2_t inc ={ gbxinc, gbyinc }; const vec2_t inc = { gbxinc, gbyinc };
const vec2_t log ={ glogx, glogy }; const vec2_t log = { glogx, glogy };
const vec2_t log32 ={ 32-log.x, 32-log.y }; const vec2_t log32 = { 32-log.x, 32-log.y };
char *pp = (char *)p; char *pp = (char *)p;
#ifdef CLASSIC_SLICE_BY_4 #ifdef CLASSIC_SLICE_BY_4

View file

@ -190,7 +190,7 @@ static uint8_t visited[MAXWALLS>>3];
int32_t m32_2d3dmode = 0; int32_t m32_2d3dmode = 0;
int32_t m32_2d3dsize = 4; int32_t m32_2d3dsize = 4;
vec2_t m32_2d3d ={ 0xffff, 4 }; vec2_t m32_2d3d = { 0xffff, 4 };
typedef struct typedef struct
{ {
@ -3357,7 +3357,7 @@ void overheadeditor(void)
int16_t cursectorhighlight, sectorhighlightstat; int16_t cursectorhighlight, sectorhighlightstat;
int32_t prefixarg = 0, tsign; int32_t prefixarg = 0, tsign;
int32_t resetsynctics = 0, lasttick=getticks(), waitdelay=totalclock, lastdraw=getticks(); int32_t resetsynctics = 0, lasttick=getticks(), waitdelay=totalclock, lastdraw=getticks();
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;
ovh.suckwall = -1; ovh.suckwall = -1;
@ -3853,7 +3853,7 @@ void overheadeditor(void)
#ifdef USE_OPENGL #ifdef USE_OPENGL
int bakrendmode = rendmode; int bakrendmode = rendmode;
#endif #endif
vec2_t bdim ={ xdim, ydim }; vec2_t bdim = { xdim, ydim };
xdim = xdim2d; xdim = xdim2d;
ydim = ydim2d; ydim = ydim2d;
@ -3884,7 +3884,7 @@ void overheadeditor(void)
setview(m32_2d3d.x, m32_2d3d.y, m32_2d3d.x + XSIZE_2D3D, m32_2d3d.y + YSIZE_2D3D); setview(m32_2d3d.x, m32_2d3d.y, m32_2d3d.x + XSIZE_2D3D, m32_2d3d.y + YSIZE_2D3D);
clearview(-1); clearview(-1);
vec2_t osearch ={ searchx, searchy }; vec2_t osearch = { searchx, searchy };
searchx -= m32_2d3d.x; searchx -= m32_2d3d.x;
searchy -= m32_2d3d.y; searchy -= m32_2d3d.y;

View file

@ -5742,7 +5742,7 @@ draw_as_face_sprite:
int32_t const xspan = ((B_LITTLE32(longptr[0]) + B_LITTLE32(longptr[1])) >> 1); int32_t const xspan = ((B_LITTLE32(longptr[0]) + B_LITTLE32(longptr[1])) >> 1);
int32_t const yspan = B_LITTLE32(longptr[2]); int32_t const yspan = B_LITTLE32(longptr[2]);
vec2_t const siz ={ mulscale_triple30(xdsiz, xv, xspan), mulscale_triple30(xdsiz, nyrepeat, yspan) }; vec2_t const siz = { mulscale_triple30(xdsiz, xv, xspan), mulscale_triple30(xdsiz, nyrepeat, yspan) };
//Watch out for divscale overflow //Watch out for divscale overflow
if (((xspan>>11) < siz.x) && (yspan < (siz.y>>1))) if (((xspan>>11) < siz.x) && (yspan < (siz.y>>1)))
@ -8649,8 +8649,8 @@ void drawmapview(int32_t dax, int32_t day, int32_t zoome, int16_t ang)
Bmemset(gotsector, 0, (numsectors+7)>>3); Bmemset(gotsector, 0, (numsectors+7)>>3);
vec2_t const c1 ={ (windowxy1.x<<12), (windowxy1.y<<12) }; vec2_t const c1 = { (windowxy1.x<<12), (windowxy1.y<<12) };
vec2_t const c2 ={ ((windowxy2.x+1)<<12)-1, ((windowxy2.y+1)<<12)-1 }; vec2_t const c2 = { ((windowxy2.x+1)<<12)-1, ((windowxy2.y+1)<<12)-1 };
zoome <<= 8; zoome <<= 8;
@ -8710,7 +8710,7 @@ void drawmapview(int32_t dax, int32_t day, int32_t zoome, int16_t ang)
#endif #endif
if ((i&0xf0) != 0xf0) continue; if ((i&0xf0) != 0xf0) continue;
vec2_t bak ={ rx1[0], mulscale16(ry1[0]-(ydim<<11),xyaspect)+(ydim<<11) }; vec2_t bak = { rx1[0], mulscale16(ry1[0]-(ydim<<11),xyaspect)+(ydim<<11) };
if (i&0x0f) if (i&0x0f)
{ {
@ -8820,7 +8820,7 @@ void drawmapview(int32_t dax, int32_t day, int32_t zoome, int16_t ang)
const int32_t xspan = tilesiz[spr->picnum].x; const int32_t xspan = tilesiz[spr->picnum].x;
int32_t npoints = 0; int32_t npoints = 0;
vec2_t v1 ={ spr->x, spr->y }, v2, v3, v4; vec2_t v1 = { spr->x, spr->y }, v2, v3, v4;
get_floorspr_points(spr, 0, 0, &v1.x, &v2.x, &v3.x, &v4.x, get_floorspr_points(spr, 0, 0, &v1.x, &v2.x, &v3.x, &v4.x,
&v1.y, &v2.y, &v3.y, &v4.y); &v1.y, &v2.y, &v3.y, &v4.y);

View file

@ -8,7 +8,7 @@
#include "a.h" #include "a.h"
#include "xxhash.h" #include "xxhash.h"
uint8_t *basepaltable[MAXBASEPALS] ={ palette }; uint8_t *basepaltable[MAXBASEPALS] = { palette };
uint8_t basepalreset=1; uint8_t basepalreset=1;
uint8_t curbasepal; uint8_t curbasepal;
int32_t globalblend; int32_t globalblend;
@ -16,7 +16,7 @@ int32_t globalblend;
uint32_t g_lastpalettesum = 0; uint32_t g_lastpalettesum = 0;
palette_t curpalette[256]; // the current palette, unadjusted for brightness or tint palette_t curpalette[256]; // the current palette, unadjusted for brightness or tint
palette_t curpalettefaded[256]; // the current palette, adjusted for brightness and tint (ie. what gets sent to the card) palette_t curpalettefaded[256]; // the current palette, adjusted for brightness and tint (ie. what gets sent to the card)
palette_t palfadergb ={ 0,0,0,0 }; palette_t palfadergb = { 0, 0, 0, 0 };
char palfadedelta = 0; char palfadedelta = 0;
uint8_t blackcol; uint8_t blackcol;
@ -533,7 +533,7 @@ void makepalookup(int32_t palnum, const char *remapbuf, uint8_t r, uint8_t g, ui
{ {
int32_t i, j; int32_t i, j;
static char idmap[256] ={ 1 }; static char idmap[256] = { 1 };
if (paletteloaded == 0) if (paletteloaded == 0)
return; return;

View file

@ -2206,7 +2206,7 @@ static void polymer_emptybuckets(void)
prcanbucket = 0; prcanbucket = 0;
} }
static hashtable_t h_buckets ={ 2048, NULL }; static hashtable_t h_buckets = { 2048, NULL };
static _prbucket* polymer_findbucket(int16_t tilenum, char pal) static _prbucket* polymer_findbucket(int16_t tilenum, char pal)
{ {

View file

@ -2317,7 +2317,7 @@ skip: ;
case 3: case 3:
case 1: case 1:
{ {
vec2f_t const dpxy[4] ={ vec2f_t const dpxy[4] = {
{ dx0, n0.y }, { dx1, n1.y }, { dx1, vsp[i].fy[1] }, { dx0, vsp[i].fy[0] } { dx0, n0.y }, { dx1, n1.y }, { dx1, vsp[i].fy[1] }, { dx0, vsp[i].fy[0] }
}; };
@ -2340,7 +2340,7 @@ skip: ;
case 5: case 5:
case 2: case 2:
{ {
vec2f_t const dpxy[3] ={ { dx0, vsp[i].fy[0] }, { dx1, n1.y }, { dx1, vsp[i].fy[1] } }; vec2f_t const dpxy[3] = { { dx0, vsp[i].fy[0] }, { dx1, n1.y }, { dx1, vsp[i].fy[1] } };
vsp[i].fy[1] = n1.y; vsp[i].fy[1] = n1.y;
vsp[i].ftag = gtag; vsp[i].ftag = gtag;
@ -2349,7 +2349,7 @@ skip: ;
break; break;
case 0: case 0:
{ {
vec2f_t const dpxy[4] ={ { dx0, vsp[i].cy[0] }, { dx1, vsp[i].cy[1] }, { dx1, vsp[i].fy[1] }, { dx0, vsp[i].fy[0] } }; vec2f_t const dpxy[4] = { { dx0, vsp[i].cy[0] }, { dx1, vsp[i].cy[1] }, { dx1, vsp[i].fy[1] }, { dx0, vsp[i].fy[0] } };
vsp[i].ctag = vsp[i].ftag = -1; vsp[i].ctag = vsp[i].ftag = -1;
polymost_drawpoly(dpxy, 4, domostpolymethod); polymost_drawpoly(dpxy, 4, domostpolymethod);
} }
@ -2472,7 +2472,7 @@ void polymost_editorfunc(void)
int const ang = getangle(wall[hit->wall].x - POINT2(hit->wall).x, wall[hit->wall].y - POINT2(hit->wall).y); int const ang = getangle(wall[hit->wall].x - POINT2(hit->wall).x, wall[hit->wall].y - POINT2(hit->wall).y);
tsp->ang = ang + 512; tsp->ang = ang + 512;
vec2_t const offs ={ sintable[(ang + 1024) & 2047] >> 11, vec2_t const offs = { sintable[(ang + 1024) & 2047] >> 11,
sintable[(ang + 512) & 2047] >> 11}; sintable[(ang + 512) & 2047] >> 11};
tsp->x -= offs.x; tsp->x -= offs.x;
@ -4417,7 +4417,7 @@ void polymost_drawsprite(int32_t snum)
float const foffs = TSPR_OFFSET(tspr); float const foffs = TSPR_OFFSET(tspr);
vec2f_t const offs ={ (float) (sintable[(ang + 512) & 2047] >> 6) * foffs, vec2f_t const offs = { (float) (sintable[(ang + 512) & 2047] >> 6) * foffs,
(float) (sintable[(ang) & 2047] >> 6) * foffs }; (float) (sintable[(ang) & 2047] >> 6) * foffs };
vec2f_t s0 = { (float)(tspr->x - globalposx) + offs.x, vec2f_t s0 = { (float)(tspr->x - globalposx) + offs.x,
@ -5252,7 +5252,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
drawpoly_blend = dablend; drawpoly_blend = dablend;
vec2_t const siz = tilesiz[globalpicnum]; vec2_t const siz = tilesiz[globalpicnum];
vec2_t ofs ={ 0, 0 }; vec2_t ofs = { 0, 0 };
if (!(dastat & RS_TOPLEFT)) if (!(dastat & RS_TOPLEFT))
{ {

View file

@ -220,7 +220,7 @@ static int32_t screencapture_png(const char *filename, char inverseit, const cha
static int32_t screencapture_tga(const char *filename, char inverseit) static int32_t screencapture_tga(const char *filename, char inverseit)
{ {
int32_t i; int32_t i;
char *ptr, head[18] ={ 0,1,1,0,0,0,1,24,0,0,0,0,0/*wlo*/,0/*whi*/,0/*hlo*/,0/*hhi*/,8,0 }; char *ptr, head[18] = { 0,1,1,0,0,0,1,24,0,0,0,0,0/*wlo*/,0/*whi*/,0/*hlo*/,0/*hhi*/,8,0 };
//char palette[4*256]; //char palette[4*256];
char *fn = Xstrdup(filename); char *fn = Xstrdup(filename);
# ifdef USE_OPENGL # ifdef USE_OPENGL

View file

@ -670,7 +670,7 @@ void A_DoGuts(int spriteNum, int tileNum, int spawnCnt)
void A_DoGutsDir(int spriteNum, int tileNum, int spawnCnt) void A_DoGutsDir(int spriteNum, int tileNum, int spawnCnt)
{ {
uspritetype const * const s = (uspritetype *)&sprite[spriteNum]; uspritetype const * const s = (uspritetype *)&sprite[spriteNum];
vec2_t repeat ={ 32, 32 }; vec2_t repeat = { 32, 32 };
if (A_CheckEnemySprite(s) && s->xrepeat < 16) if (A_CheckEnemySprite(s) && s->xrepeat < 16)
repeat.x = repeat.y = 8; repeat.x = repeat.y = 8;
@ -3035,7 +3035,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
sprite[newSprite].z += (1 << 8); sprite[newSprite].z += (1 << 8);
} }
vec3_t const tmpvect ={ (spriteXvel * (sintable[(pSprite->ang + 512) & 2047])) >> 14, vec3_t const tmpvect = { (spriteXvel * (sintable[(pSprite->ang + 512) & 2047])) >> 14,
(spriteXvel * (sintable[pSprite->ang & 2047])) >> 14, spriteZvel }; (spriteXvel * (sintable[pSprite->ang & 2047])) >> 14, spriteZvel };
int moveSprite = A_MoveSprite(spriteNum, &tmpvect, (A_CheckSpriteFlags(spriteNum, SFLAG_NOCLIP) ? 0 : CLIPMASK1)); int moveSprite = A_MoveSprite(spriteNum, &tmpvect, (A_CheckSpriteFlags(spriteNum, SFLAG_NOCLIP) ? 0 : CLIPMASK1));

View file

@ -614,7 +614,7 @@ void G_DoCheats(void)
case CHEAT_MONSTERS: case CHEAT_MONSTERS:
{ {
const char *s [] ={ "On", "Off", "On (2)" }; const char *s [] = { "On", "Off", "On (2)" };
if (++g_noEnemies == 3) if (++g_noEnemies == 3)
g_noEnemies = 0; g_noEnemies = 0;

View file

@ -1284,7 +1284,7 @@ static hashtable_t * const tables[] = {
&h_iter &h_iter
}; };
static hashtable_t * const tables_free [] ={ static hashtable_t * const tables_free [] = {
&h_labels, &h_keywords, &h_sector, &h_wall, &h_userdef, &h_labels, &h_keywords, &h_sector, &h_wall, &h_userdef,
&h_projectile, &h_player, &h_input, &h_actor, &h_tsprite, &h_tiledata, &h_paldata, &h_projectile, &h_player, &h_input, &h_actor, &h_tsprite, &h_tiledata, &h_paldata,
&h_iter &h_iter

View file

@ -604,7 +604,7 @@ static int32_t walls_have_equal_endpoints(int32_t w1, int32_t w2)
static void correct_yax_nextwall(int32_t wallnum, int32_t bunchnum, int32_t cf, int32_t tryfixingp) static void correct_yax_nextwall(int32_t wallnum, int32_t bunchnum, int32_t cf, int32_t tryfixingp)
{ {
int32_t i, j, startwall, endwall; int32_t i, j, startwall, endwall;
int32_t nummatching=0, lastwall[2]={-1,-1}; int32_t nummatching=0, lastwall[2] = { -1, -1 };
for (SECTORS_OF_BUNCH(bunchnum, !cf, i)) for (SECTORS_OF_BUNCH(bunchnum, !cf, i))
for (WALLS_OF_SECTOR(i, j)) for (WALLS_OF_SECTOR(i, j))

View file

@ -460,14 +460,14 @@ static MenuOption_t MEO_VIDEOSETUP_FULLSCREEN = MAKE_MENUOPTION( &MF_Redfont, &M
static MenuEntry_t ME_VIDEOSETUP_FULLSCREEN = MAKE_MENUENTRY( "Fullscreen:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_VIDEOSETUP_FULLSCREEN, Option ); static MenuEntry_t ME_VIDEOSETUP_FULLSCREEN = MAKE_MENUENTRY( "Fullscreen:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_VIDEOSETUP_FULLSCREEN, Option );
static char const *MEOSN_VIDEOSETUP_VSYNC [] ={ "Adaptive", "Off", "On", }; static char const *MEOSN_VIDEOSETUP_VSYNC [] = { "Adaptive", "Off", "On", };
static int32_t MEOSV_VIDEOSETUP_VSYNC [] ={ -1, 0, 1, }; static int32_t MEOSV_VIDEOSETUP_VSYNC [] = { -1, 0, 1, };
static MenuOptionSet_t MEOS_VIDEOSETUP_VSYNC = MAKE_MENUOPTIONSET(MEOSN_VIDEOSETUP_VSYNC, MEOSV_VIDEOSETUP_VSYNC, 0x2); static MenuOptionSet_t MEOS_VIDEOSETUP_VSYNC = MAKE_MENUOPTIONSET(MEOSN_VIDEOSETUP_VSYNC, MEOSV_VIDEOSETUP_VSYNC, 0x2);
static MenuOption_t MEO_VIDEOSETUP_VSYNC = MAKE_MENUOPTION(&MF_Redfont, &MEOS_VIDEOSETUP_VSYNC, &newvsync); static MenuOption_t MEO_VIDEOSETUP_VSYNC = MAKE_MENUOPTION(&MF_Redfont, &MEOS_VIDEOSETUP_VSYNC, &newvsync);
static MenuEntry_t ME_VIDEOSETUP_VSYNC = MAKE_MENUENTRY("VSync:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_VIDEOSETUP_VSYNC, Option); static MenuEntry_t ME_VIDEOSETUP_VSYNC = MAKE_MENUENTRY("VSync:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_VIDEOSETUP_VSYNC, Option);
static char const *MEOSN_VIDEOSETUP_FRAMELIMIT [] ={ "None", "30 fps", "60 fps", "120 fps", "144 fps", }; static char const *MEOSN_VIDEOSETUP_FRAMELIMIT [] = { "None", "30 fps", "60 fps", "120 fps", "144 fps", };
static int32_t MEOSV_VIDEOSETUP_FRAMELIMIT [] ={ 0, 30, 60, 120, 144 }; static int32_t MEOSV_VIDEOSETUP_FRAMELIMIT [] = { 0, 30, 60, 120, 144 };
static MenuOptionSet_t MEOS_VIDEOSETUP_FRAMELIMIT = MAKE_MENUOPTIONSET(MEOSN_VIDEOSETUP_FRAMELIMIT, MEOSV_VIDEOSETUP_FRAMELIMIT, 0x2); static MenuOptionSet_t MEOS_VIDEOSETUP_FRAMELIMIT = MAKE_MENUOPTIONSET(MEOSN_VIDEOSETUP_FRAMELIMIT, MEOSV_VIDEOSETUP_FRAMELIMIT, 0x2);
static MenuOption_t MEO_VIDEOSETUP_FRAMELIMIT= MAKE_MENUOPTION(&MF_Redfont, &MEOS_VIDEOSETUP_FRAMELIMIT, &r_maxfps); static MenuOption_t MEO_VIDEOSETUP_FRAMELIMIT= MAKE_MENUOPTION(&MF_Redfont, &MEOS_VIDEOSETUP_FRAMELIMIT, &r_maxfps);
static MenuEntry_t ME_VIDEOSETUP_FRAMELIMIT = MAKE_MENUENTRY("Framerate limit:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_VIDEOSETUP_FRAMELIMIT, Option); static MenuEntry_t ME_VIDEOSETUP_FRAMELIMIT = MAKE_MENUENTRY("Framerate limit:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_VIDEOSETUP_FRAMELIMIT, Option);
@ -562,7 +562,7 @@ static MenuLink_t MEO_DISPLAYSETUP_ADVANCED_GL_POLYMOST = { MENU_POLYMOST, MA_Ad
static MenuEntry_t ME_DISPLAYSETUP_ADVANCED_GL_POLYMOST = MAKE_MENUENTRY( "Polymost setup", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_ADVANCED_GL_POLYMOST, Link ); static MenuEntry_t ME_DISPLAYSETUP_ADVANCED_GL_POLYMOST = MAKE_MENUENTRY( "Polymost setup", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_ADVANCED_GL_POLYMOST, Link );
#ifdef POLYMER #ifdef POLYMER
static MenuLink_t MEO_DISPLAYSETUP_ADVANCED_GL_POLYMER ={ MENU_POLYMER, MA_Advance, }; static MenuLink_t MEO_DISPLAYSETUP_ADVANCED_GL_POLYMER = { MENU_POLYMER, MA_Advance, };
static MenuEntry_t ME_DISPLAYSETUP_ADVANCED_GL_POLYMER = MAKE_MENUENTRY("Polymer setup", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_ADVANCED_GL_POLYMER, Link); static MenuEntry_t ME_DISPLAYSETUP_ADVANCED_GL_POLYMER = MAKE_MENUENTRY("Polymer setup", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_ADVANCED_GL_POLYMER, Link);
#endif #endif
#endif #endif
@ -764,7 +764,7 @@ static MenuEntry_t ME_MOUSESETUP_BTNS = MAKE_MENUENTRY( "Button assignment", &MF
static MenuRangeFloat_t MEO_MOUSESETUP_SENSITIVITY = MAKE_MENURANGE( &CONTROL_MouseSensitivity, &MF_Redfont, .5f, 16.f, 0.f, 32, 1 ); static MenuRangeFloat_t MEO_MOUSESETUP_SENSITIVITY = MAKE_MENURANGE( &CONTROL_MouseSensitivity, &MF_Redfont, .5f, 16.f, 0.f, 32, 1 );
static MenuEntry_t ME_MOUSESETUP_SENSITIVITY = MAKE_MENUENTRY( "Sensitivity:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_SENSITIVITY, RangeFloat ); static MenuEntry_t ME_MOUSESETUP_SENSITIVITY = MAKE_MENUENTRY( "Sensitivity:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_SENSITIVITY, RangeFloat );
static char const *MEOSN_MOUSESETUP_AIM_TYPE [] ={ "Toggle", "Hold" }; static char const *MEOSN_MOUSESETUP_AIM_TYPE [] = { "Toggle", "Hold" };
static MenuOptionSet_t MEOS_MOUSESETUP_AIM_TYPE = MAKE_MENUOPTIONSET(MEOSN_MOUSESETUP_AIM_TYPE, NULL, 0x2); static MenuOptionSet_t MEOS_MOUSESETUP_AIM_TYPE = MAKE_MENUOPTIONSET(MEOSN_MOUSESETUP_AIM_TYPE, NULL, 0x2);
static MenuOption_t MEO_MOUSESETUP_MOUSEAIMINGTYPE = MAKE_MENUOPTION(&MF_Redfont, &MEOS_MOUSESETUP_AIM_TYPE, &ud.mouseaiming); static MenuOption_t MEO_MOUSESETUP_MOUSEAIMINGTYPE = MAKE_MENUOPTION(&MF_Redfont, &MEOS_MOUSESETUP_AIM_TYPE, &ud.mouseaiming);
static MenuEntry_t ME_MOUSESETUP_MOUSEAIMINGTYPE = MAKE_MENUENTRY("Aiming type:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_MOUSEAIMINGTYPE, Option); static MenuEntry_t ME_MOUSESETUP_MOUSEAIMINGTYPE = MAKE_MENUENTRY("Aiming type:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_MOUSEAIMINGTYPE, Option);
@ -807,12 +807,12 @@ static MenuEntry_t ME_TOUCHSETUP_INVERT = MAKE_MENUENTRY("Invert look:", &MF_Red
MAKE_MENU_TOP_ENTRYLINK("Sensitivity", MEF_CenterMenu, TOUCHSENS, MENU_TOUCHSENS); MAKE_MENU_TOP_ENTRYLINK("Sensitivity", MEF_CenterMenu, TOUCHSENS, MENU_TOUCHSENS);
MAKE_MENU_TOP_ENTRYLINK("Button Setup", MEF_CenterMenu, TOUCHBUTTONS, MENU_TOUCHBUTTONS); MAKE_MENU_TOP_ENTRYLINK("Button Setup", MEF_CenterMenu, TOUCHBUTTONS, MENU_TOUCHBUTTONS);
static MenuEntry_t *MEL_TOUCHSETUP [] ={ static MenuEntry_t *MEL_TOUCHSETUP [] = {
&ME_TOUCHSENS, &ME_TOUCHSENS,
&ME_TOUCHBUTTONS, &ME_TOUCHBUTTONS,
}; };
static MenuEntry_t *MEL_TOUCHSENS [] ={ static MenuEntry_t *MEL_TOUCHSENS [] = {
&ME_TOUCHSETUP_SENSITIVITY_MOVE, &ME_TOUCHSETUP_SENSITIVITY_MOVE,
&ME_TOUCHSETUP_SENSITIVITY_STRAFE, &ME_TOUCHSETUP_SENSITIVITY_STRAFE,
&ME_TOUCHSETUP_SENSITIVITY_LOOK, &ME_TOUCHSETUP_SENSITIVITY_LOOK,
@ -914,7 +914,7 @@ static MenuEntry_t *MEL_INTERNAL_JOYSTICKAXIS_DIGITAL[] = {
static MenuOption_t MEO_RENDERERSETUP_HIGHTILE = MAKE_MENUOPTION( &MF_Bluefont, &MEOS_NoYes, &usehightile ); static MenuOption_t MEO_RENDERERSETUP_HIGHTILE = MAKE_MENUOPTION( &MF_Bluefont, &MEOS_NoYes, &usehightile );
static MenuEntry_t ME_RENDERERSETUP_HIGHTILE = MAKE_MENUENTRY( "Truecolor textures:", &MF_BluefontRed, &MEF_SmallOptions, &MEO_RENDERERSETUP_HIGHTILE, Option ); static MenuEntry_t ME_RENDERERSETUP_HIGHTILE = MAKE_MENUENTRY( "Truecolor textures:", &MF_BluefontRed, &MEF_SmallOptions, &MEO_RENDERERSETUP_HIGHTILE, Option );
static char const *MEOSN_RENDERERSETUP_TEXQUALITY [] ={ "Full", "Half", "Barf", }; static char const *MEOSN_RENDERERSETUP_TEXQUALITY [] = { "Full", "Half", "Barf", };
static MenuOptionSet_t MEOS_RENDERERSETUP_TEXQUALITY = MAKE_MENUOPTIONSET(MEOSN_RENDERERSETUP_TEXQUALITY, NULL, 0x2); static MenuOptionSet_t MEOS_RENDERERSETUP_TEXQUALITY = MAKE_MENUOPTIONSET(MEOSN_RENDERERSETUP_TEXQUALITY, NULL, 0x2);
static MenuOption_t MEO_RENDERERSETUP_TEXQUALITY = MAKE_MENUOPTION(&MF_Bluefont, &MEOS_RENDERERSETUP_TEXQUALITY, &r_downsize); static MenuOption_t MEO_RENDERERSETUP_TEXQUALITY = MAKE_MENUOPTION(&MF_Bluefont, &MEOS_RENDERERSETUP_TEXQUALITY, &r_downsize);
static MenuEntry_t ME_RENDERERSETUP_TEXQUALITY = MAKE_MENUENTRY("GL texture quality:", &MF_BluefontRed, &MEF_SmallOptions, &MEO_RENDERERSETUP_TEXQUALITY, Option); static MenuEntry_t ME_RENDERERSETUP_TEXQUALITY = MAKE_MENUENTRY("GL texture quality:", &MF_BluefontRed, &MEF_SmallOptions, &MEO_RENDERERSETUP_TEXQUALITY, Option);
@ -939,7 +939,7 @@ static MenuEntry_t ME_RENDERERSETUP_MODELS = MAKE_MENUENTRY( "Use 3d models:", &
#endif #endif
#ifdef POLYMER #ifdef POLYMER
static char const *MEOSN_POLYMER_LIGHTS [] ={ "Off", "Full", "Map only", }; static char const *MEOSN_POLYMER_LIGHTS [] = { "Off", "Full", "Map only", };
static MenuOptionSet_t MEOS_POLYMER_LIGHTS = MAKE_MENUOPTIONSET(MEOSN_POLYMER_LIGHTS, NULL, 0x2); static MenuOptionSet_t MEOS_POLYMER_LIGHTS = MAKE_MENUOPTIONSET(MEOSN_POLYMER_LIGHTS, NULL, 0x2);
static MenuOption_t MEO_POLYMER_LIGHTS = MAKE_MENUOPTION(&MF_Bluefont, &MEOS_POLYMER_LIGHTS, &pr_lighting); static MenuOption_t MEO_POLYMER_LIGHTS = MAKE_MENUOPTION(&MF_Bluefont, &MEOS_POLYMER_LIGHTS, &pr_lighting);
static MenuEntry_t ME_POLYMER_LIGHTS = MAKE_MENUENTRY("Dynamic lights:", &MF_BluefontRed, &MEF_SmallOptions, &MEO_POLYMER_LIGHTS, Option); static MenuEntry_t ME_POLYMER_LIGHTS = MAKE_MENUENTRY("Dynamic lights:", &MF_BluefontRed, &MEF_SmallOptions, &MEO_POLYMER_LIGHTS, Option);
@ -972,7 +972,7 @@ static MenuEntry_t *MEL_RENDERERSETUP_POLYMOST[] = {
}; };
#ifdef POLYMER #ifdef POLYMER
static MenuEntry_t *MEL_RENDERERSETUP_POLYMER [] ={ static MenuEntry_t *MEL_RENDERERSETUP_POLYMER [] = {
&ME_RENDERERSETUP_HIGHTILE, &ME_RENDERERSETUP_HIGHTILE,
&ME_RENDERERSETUP_TEXQUALITY, &ME_RENDERERSETUP_TEXQUALITY,
&ME_RENDERERSETUP_PRECACHE, &ME_RENDERERSETUP_PRECACHE,
@ -1244,7 +1244,7 @@ static MenuMenu_t M_MOUSESETUP = MAKE_MENUMENU( "Mouse Setup", &MMF_BigOptions,
#ifdef EDUKE32_ANDROID_MENU #ifdef EDUKE32_ANDROID_MENU
static MenuMenu_t M_TOUCHSETUP = MAKE_MENUMENU( "Touch Setup", &MMF_Top_Options, MEL_TOUCHSETUP ); static MenuMenu_t M_TOUCHSETUP = MAKE_MENUMENU( "Touch Setup", &MMF_Top_Options, MEL_TOUCHSETUP );
static MenuMenu_t M_TOUCHSENS = MAKE_MENUMENU( "Sensitivity", &MMF_BigOptions, MEL_TOUCHSENS); static MenuMenu_t M_TOUCHSENS = MAKE_MENUMENU( "Sensitivity", &MMF_BigOptions, MEL_TOUCHSENS);
static MenuPanel_t M_TOUCHBUTTONS ={ "Button Setup", MENU_TOUCHSETUP, MA_Return, MENU_TOUCHSETUP, MA_Advance, }; static MenuPanel_t M_TOUCHBUTTONS = { "Button Setup", MENU_TOUCHSETUP, MA_Return, MENU_TOUCHSETUP, MA_Advance, };
#endif #endif
static MenuMenu_t M_JOYSTICKSETUP = MAKE_MENUMENU( "Joystick Setup", &MMF_Top_Joystick_Network, MEL_JOYSTICKSETUP ); static MenuMenu_t M_JOYSTICKSETUP = MAKE_MENUMENU( "Joystick Setup", &MMF_Top_Joystick_Network, MEL_JOYSTICKSETUP );
static MenuMenu_t M_JOYSTICKBTNS = MAKE_MENUMENU( "Joystick Buttons", &MMF_MouseJoySetupBtns, MEL_JOYSTICKBTNS ); static MenuMenu_t M_JOYSTICKBTNS = MAKE_MENUMENU( "Joystick Buttons", &MMF_MouseJoySetupBtns, MEL_JOYSTICKBTNS );
@ -2668,7 +2668,7 @@ static void Menu_EntryLinkActivate(MenuEntry_t *entry)
if (entry == &ME_VIDEOSETUP_APPLY) if (entry == &ME_VIDEOSETUP_APPLY)
{ {
resolution_t p ={ xdim, ydim, fullscreen, bpp, 0 }; resolution_t p = { xdim, ydim, fullscreen, bpp, 0 };
int32_t prend = getrendermode(); int32_t prend = getrendermode();
int32_t pvsync = vsync; int32_t pvsync = vsync;

View file

@ -1987,7 +1987,7 @@ void P_DisplayScuba(void)
} }
} }
static int8_t const access_tip_y [] ={ static int8_t const access_tip_y [] = {
0, -8, -16, -32, -64, -84, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -96, -72, -64, -32, -16, 0, -8, -16, -32, -64, -84, -108, -108, -108, -108, -108, -108, -108, -108, -108, -108, -96, -72, -64, -32, -16,
/* EDuke32: */ 0, 16, 32, 48, /* EDuke32: */ 0, 16, 32, 48,
// At y coord 64, the hand is already not shown. // At y coord 64, the hand is already not shown.
@ -2535,7 +2535,7 @@ void P_DisplayWeapon(void)
case HANDBOMB_WEAPON: case HANDBOMB_WEAPON:
{ {
static uint8_t pipebombFrames [] ={ 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2 }; static uint8_t pipebombFrames [] = { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2 };
if (*weaponFrame >= PWEAPON(screenpeek, pPlayer->curr_weapon, TotalTime) || *weaponFrame >= ARRAY_SIZE(pipebombFrames)) if (*weaponFrame >= PWEAPON(screenpeek, pPlayer->curr_weapon, TotalTime) || *weaponFrame >= ARRAY_SIZE(pipebombFrames))
break; break;

View file

@ -573,7 +573,7 @@ void G_DrawStatusBar(int32_t snum)
if (item_icons[0] == 0) if (item_icons[0] == 0)
{ {
int32_t iicons[8] ={ -1, FIRSTAID_ICON, STEROIDS_ICON, HOLODUKE_ICON, int32_t iicons[8] = { -1, FIRSTAID_ICON, STEROIDS_ICON, HOLODUKE_ICON,
JETPACK_ICON, HEAT_ICON, AIRTANK_ICON, BOOT_ICON }; JETPACK_ICON, HEAT_ICON, AIRTANK_ICON, BOOT_ICON };
Bmemcpy(item_icons, iicons, sizeof(item_icons)); Bmemcpy(item_icons, iicons, sizeof(item_icons));
} }
@ -615,7 +615,7 @@ void G_DrawStatusBar(int32_t snum)
but we don't want to have to recreate the values in memory every time but we don't want to have to recreate the values in memory every time
the HUD is drawn */ the HUD is drawn */
int32_t asprites[MAX_WEAPONS] ={ -1, AMMO, SHOTGUNAMMO, BATTERYAMMO, int32_t asprites[MAX_WEAPONS] = { -1, AMMO, SHOTGUNAMMO, BATTERYAMMO,
RPGAMMO, HBOMBAMMO, CRYSTALAMMO, DEVISTATORAMMO, RPGAMMO, HBOMBAMMO, CRYSTALAMMO, DEVISTATORAMMO,
TRIPBOMBSPRITE, FREEZEAMMO+1, HBOMBAMMO, GROWAMMO TRIPBOMBSPRITE, FREEZEAMMO+1, HBOMBAMMO, GROWAMMO
}; };
@ -875,7 +875,7 @@ void G_DrawStatusBar(int32_t snum)
} }
{ {
static const int32_t check_items [] ={ static const int32_t check_items [] = {
GET_FIRSTAID, GET_STEROIDS, GET_HOLODUKE, GET_JETPACK, GET_FIRSTAID, GET_STEROIDS, GET_HOLODUKE, GET_JETPACK,
GET_HEATS, GET_SCUBA, GET_BOOTS GET_HEATS, GET_SCUBA, GET_BOOTS
}; };

View file

@ -41,8 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define quotepulseshade (sintable[((uint32_t)totalclock<<5)&2047]>>11) #define quotepulseshade (sintable[((uint32_t)totalclock<<5)&2047]>>11)
palette_t CrosshairColors ={ 255, 255, 255, 0 }; palette_t CrosshairColors = { 255, 255, 255, 0 };
palette_t DefaultCrosshairColors ={ 0, 0, 0, 0 }; palette_t DefaultCrosshairColors = { 0, 0, 0, 0 };
int32_t g_crosshairSum = -1; int32_t g_crosshairSum = -1;
// yxaspect and viewingrange just before the 'main' drawrooms call // yxaspect and viewingrange just before the 'main' drawrooms call
int32_t dr_yxaspect, dr_viewingrange; int32_t dr_yxaspect, dr_viewingrange;
@ -858,12 +858,12 @@ void G_DisplayRest(int32_t smoothratio)
{ {
if (pp->palette == WATERPAL) if (pp->palette == WATERPAL)
{ {
static const palette_t wp ={ 224, 192, 255, 0 }; static const palette_t wp = { 224, 192, 255, 0 };
Bmemcpy(&hictinting[MAXPALOOKUPS-1], &wp, sizeof(palette_t)); Bmemcpy(&hictinting[MAXPALOOKUPS-1], &wp, sizeof(palette_t));
} }
else if (pp->palette == SLIMEPAL) else if (pp->palette == SLIMEPAL)
{ {
static const palette_t sp ={ 208, 255, 192, 0 }; static const palette_t sp = { 208, 255, 192, 0 };
Bmemcpy(&hictinting[MAXPALOOKUPS-1], &sp, sizeof(palette_t)); Bmemcpy(&hictinting[MAXPALOOKUPS-1], &sp, sizeof(palette_t));
} }
else else
@ -881,7 +881,7 @@ void G_DisplayRest(int32_t smoothratio)
palaccum_add(&tint, &pp2->pals, pp2->pals.f); palaccum_add(&tint, &pp2->pals, pp2->pals.f);
#endif #endif
{ {
static const palette_t loogiepal ={ 0, 63, 0, 0 }; static const palette_t loogiepal = { 0, 63, 0, 0 };
palaccum_add(&tint, &loogiepal, pp->loogcnt>>1); palaccum_add(&tint, &loogiepal, pp->loogcnt>>1);
#ifdef SPLITSCREEN_MOD_HACKS #ifdef SPLITSCREEN_MOD_HACKS
@ -1137,7 +1137,7 @@ void G_DisplayRest(int32_t smoothratio)
if (a == 0) if (a == 0)
a = CROSSHAIR; a = CROSSHAIR;
vec2_t crosshairpos ={ 160<<16, 100<<16 }; vec2_t crosshairpos = { 160<<16, 100<<16 };
rotatesprite_win(crosshairpos.x-(g_player[myconnectindex].ps->look_ang<<15), crosshairpos.y, scale(65536, ud.crosshairscale, 100), rotatesprite_win(crosshairpos.x-(g_player[myconnectindex].ps->look_ang<<15), crosshairpos.y, scale(65536, ud.crosshairscale, 100),
0, a, 0, CROSSHAIR_PAL, 2+1); 0, a, 0, CROSSHAIR_PAL, 2+1);

View file

@ -168,10 +168,10 @@ vec2_t G_ScreenTextSize(const int32_t font,
const int32_t f, const int32_t f,
int32_t x1, int32_t y1, int32_t x2, int32_t y2) int32_t x1, int32_t y1, int32_t x2, int32_t y2)
{ {
vec2_t size ={ 0, 0, }; // eventually the return value vec2_t size = { 0, 0, }; // eventually the return value
vec2_t pos ={ 0, 0, }; // holds the coordinate position as we draw each character tile of the string vec2_t pos = { 0, 0, }; // holds the coordinate position as we draw each character tile of the string
vec2_t extent ={ 0, 0, }; // holds the x-width of each character and the greatest y-height of each line vec2_t extent = { 0, 0, }; // holds the x-width of each character and the greatest y-height of each line
vec2_t offset ={ 0, 0, }; // temporary; holds the last movement made in both directions vec2_t offset = { 0, 0, }; // temporary; holds the last movement made in both directions
int32_t tile; int32_t tile;
char t; char t;
@ -482,12 +482,12 @@ vec2_t G_ScreenText(const int32_t font,
int32_t xspace, int32_t yline, int32_t xbetween, int32_t ybetween, const int32_t f, int32_t xspace, int32_t yline, int32_t xbetween, int32_t ybetween, const int32_t f,
const int32_t x1, const int32_t y1, const int32_t x2, const int32_t y2) const int32_t x1, const int32_t y1, const int32_t x2, const int32_t y2)
{ {
vec2_t size ={ 0, 0, }; // eventually the return value vec2_t size = { 0, 0, }; // eventually the return value
vec2_t origin ={ 0, 0, }; // where to start, depending on the alignment vec2_t origin = { 0, 0, }; // where to start, depending on the alignment
vec2_t pos ={ 0, 0, }; // holds the coordinate position as we draw each character tile of the string vec2_t pos = { 0, 0, }; // holds the coordinate position as we draw each character tile of the string
vec2_t extent ={ 0, 0, }; // holds the x-width of each character and the greatest y-height of each line vec2_t extent = { 0, 0, }; // holds the x-width of each character and the greatest y-height of each line
const vec2_t Xdirection ={ sintable[(blockangle+512)&2047], sintable[blockangle&2047], }; const vec2_t Xdirection = { sintable[(blockangle+512)&2047], sintable[blockangle&2047], };
const vec2_t Ydirection ={ sintable[(blockangle+1024)&2047], sintable[(blockangle+512)&2047], }; const vec2_t Ydirection = { sintable[(blockangle+1024)&2047], sintable[(blockangle+512)&2047], };
int32_t blendidx=0, tile; int32_t blendidx=0, tile;
char t; char t;
@ -643,7 +643,7 @@ vec2_t G_ScreenText(const int32_t font,
default: default:
{ {
vec2_t location ={ x, y, }; vec2_t location = { x, y, };
G_AddCoordsFromRotation(&location, &Xdirection, origin.x); G_AddCoordsFromRotation(&location, &Xdirection, origin.x);
G_AddCoordsFromRotation(&location, &Ydirection, origin.y); G_AddCoordsFromRotation(&location, &Ydirection, origin.y);
@ -871,7 +871,7 @@ vec2_t G_ScreenTextShadow(int32_t sx, int32_t sy,
int32_t xspace, int32_t yline, int32_t xbetween, int32_t ybetween, const int32_t f, int32_t xspace, int32_t yline, int32_t xbetween, int32_t ybetween, const int32_t f,
const int32_t x1, const int32_t y1, const int32_t x2, const int32_t y2) const int32_t x1, const int32_t y1, const int32_t x2, const int32_t y2)
{ {
vec2_t size ={ 0, 0, }; // eventually the return value vec2_t size = { 0, 0, }; // eventually the return value
if (!(o & ROTATESPRITE_FULL16)) if (!(o & ROTATESPRITE_FULL16))
{ {