diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 308eb2616..43b3d19e4 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3480,7 +3480,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum) splitscreenplayer = (UINT8)READUINT8(*p); CONS_Debug(DBG_NETPLAY, "addplayer: %d %d %d\n", node, newplayernum, splitscreenplayer); - + // Clear player before joining, lest some things get set incorrectly CL_ClearPlayer(newplayernum); diff --git a/src/d_main.c b/src/d_main.c index 283deecb4..88c501345 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -468,7 +468,7 @@ static void D_Display(void) break; } - + topleft = screens[0] + viewwindowy*vid.width + viewwindowx; } diff --git a/src/djgppdos/internal.h b/src/djgppdos/internal.h index 94c1a052b..b34b5ebb7 100644 --- a/src/djgppdos/internal.h +++ b/src/djgppdos/internal.h @@ -1,6 +1,6 @@ -/* ______ ___ ___ - * /\ _ \ /\_ \ /\_ \ - * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ +/* ______ ___ ___ + * /\ _ \ /\_ \ /\_ \ + * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ @@ -22,9 +22,9 @@ #include "allegro.h" -/* ______ ___ ___ - * /\ _ \ /\_ \ /\_ \ - * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ +/* ______ ___ ___ + * /\ _ \ /\_ \ /\_ \ + * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ @@ -57,7 +57,7 @@ #define FILE_CREATE(filename, handle) handle = open(filename, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR) #define FILE_CLOSE(handle) close(handle) #define FILE_READ(handle, buf, size, sz) sz = read(handle, buf, size) -#define FILE_WRITE(handle, buf, size, sz) sz = write(handle, buf, size) +#define FILE_WRITE(handle, buf, size, sz) sz = write(handle, buf, size) #define FILE_SEARCH_STRUCT struct ffblk #define FILE_FINDFIRST(filename, attrib, dta) findfirst(filename, dta, attrib) #define FILE_FINDNEXT(dta) findnext(dta) @@ -73,11 +73,11 @@ #define ENABLE() asm volatile ("sti") -__INLINE__ void enter_critical(void) +__INLINE__ void enter_critical(void) { if (windows_version >= 3) { __dpmi_regs r; - r.x.ax = 0x1681; + r.x.ax = 0x1681; __dpmi_int(0x2F, &r); } @@ -85,11 +85,11 @@ __INLINE__ void enter_critical(void) } -__INLINE__ void exit_critical(void) +__INLINE__ void exit_critical(void) { if (windows_version >= 3) { __dpmi_regs r; - r.x.ax = 0x1682; + r.x.ax = 0x1682; __dpmi_int(0x2F, &r); } @@ -176,9 +176,9 @@ extern int _fm_port; extern int _mpu_port; extern int _mpu_irq; extern int _sb_freq; -extern int _sb_port; -extern int _sb_dma; -extern int _sb_irq; +extern int _sb_port; +extern int _sb_dma; +extern int _sb_irq; int _sb_read_dsp_version(void); int _sb_reset_dsp(int data); @@ -238,8 +238,8 @@ extern volatile int _retrace_hpp_value; /* caches and tables for svga bank switching */ -extern int _last_bank_1, _last_bank_2; -extern int *_gfx_bank; +extern int _last_bank_1, _last_bank_2; +extern int *_gfx_bank; /* bank switching routines */ @@ -282,7 +282,7 @@ extern int _crtc; __INLINE__ int _read_vga_register(int port, int index) { if (port==0x3C0) - inportb(_crtc+6); + inportb(_crtc+6); outportb(port, index); return inportb(port+1); @@ -292,7 +292,7 @@ __INLINE__ int _read_vga_register(int port, int index) /* _write_vga_register: * Writes a byte to a VGA register. */ -__INLINE__ void _write_vga_register(int port, int index, int v) +__INLINE__ void _write_vga_register(int port, int index, int v) { if (port==0x3C0) { inportb(_crtc+6); @@ -345,7 +345,7 @@ __INLINE__ void _vsync_out_v(void) __INLINE__ void _vsync_in(void) { if (_timer_use_retrace) { - int t = retrace_count; + int t = retrace_count; do { } while (t == retrace_count); @@ -555,7 +555,7 @@ typedef struct POLYGON_SEGMENT /* an active polygon edge */ -typedef struct POLYGON_EDGE +typedef struct POLYGON_EDGE { int top; /* top y position */ int bottom; /* bottom y position */ @@ -673,7 +673,7 @@ void _poly_scanline_ptex_mask_lit32d(unsigned long addr, int w, POLYGON_SEGMENT /* sound lib stuff */ extern int _digi_volume; extern int _midi_volume; -extern int _flip_pan; +extern int _flip_pan; extern int _sound_hq; extern int (*_midi_init)(void); diff --git a/src/f_wipe.c b/src/f_wipe.c index 8d73c1fe7..e42042516 100644 --- a/src/f_wipe.c +++ b/src/f_wipe.c @@ -204,7 +204,7 @@ static void F_DoWipe(fademask_t *fademask, lighttable_t *fadecolormap, boolean r // --- // Sal: I kinda destroyed some of this code by introducing Genesis-style fades. // A colormap can be provided in F_RunWipe, which the white/black values will be - // remapped to the appropriate entry in the fade colormap. + // remapped to the appropriate entry in the fade colormap. { // wipe screen, start, end UINT8 *w = wipe_scr; @@ -434,7 +434,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean r reverse = false; } - paldiv = FixedDiv(257<mo->colorized && stplyr->mo->color) // invincibility/grow/shrink! diff --git a/src/k_pwrlv.c b/src/k_pwrlv.c index 94bdb13a4..d753d4daa 100644 --- a/src/k_pwrlv.c +++ b/src/k_pwrlv.c @@ -19,7 +19,7 @@ UINT16 clientpowerlevels[MAXPLAYERS][PWRLV_NUMTYPES]; // Which players spec-scummed, and their power level before scumming. // On race finish, everyone is considered to have "won" against these people. -INT16 nospectategrief[MAXPLAYERS]; +INT16 nospectategrief[MAXPLAYERS]; // Game setting scrambles based on server Power Level SINT8 speedscramble = -1; diff --git a/src/p_saveg.c b/src/p_saveg.c index b81cc0f50..2e61af7ae 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -3309,7 +3309,7 @@ static void P_NetArchiveMisc(void) WRITEUINT32(save_p, hyubgone); WRITEUINT32(save_p, mapreset); - for (i = 0; i < MAXPLAYERS; i++) + for (i = 0; i < MAXPLAYERS; i++) WRITEINT16(save_p, nospectategrief[i]); WRITEUINT8(save_p, thwompsactive); @@ -3432,7 +3432,7 @@ static inline boolean P_NetUnArchiveMisc(void) hyubgone = READUINT32(save_p); mapreset = READUINT32(save_p); - for (i = 0; i < MAXPLAYERS; i++) + for (i = 0; i < MAXPLAYERS; i++) nospectategrief[i] = READINT16(save_p); thwompsactive = (boolean)READUINT8(save_p); diff --git a/src/p_spec.c b/src/p_spec.c index bfbdf6228..1db1039e0 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2015,7 +2015,7 @@ void P_SwitchWeather(UINT8 newWeather) return; // Nothing to do. purge = true; } - else + else { if (precipprops[curWeather].type != MT_NULL) { @@ -2056,7 +2056,7 @@ void P_SwitchWeather(UINT8 newWeather) precipmobj->flags = mobjinfo[swap].flags; st = mobjinfo[swap].spawnstate; - + if (randomstates > 0) { UINT8 mrand = M_RandomByte(); diff --git a/src/y_inter.c b/src/y_inter.c index ff168070c..7708c3e12 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -745,7 +745,7 @@ void Y_Ticker(void) remove = 10; // Remove 10 points at a time - data.match.increase[data.match.num[q]] -= remove; + data.match.increase[data.match.num[q]] -= remove; // Still not zero, no kaching yet if (data.match.increase[data.match.num[q]] != 0)