Skip to content

Commit 01f40a3

Browse files
committed
clean up some warnings, remove some shit
1 parent 2b0e4c6 commit 01f40a3

File tree

3 files changed

+4
-34
lines changed

3 files changed

+4
-34
lines changed

rott/rt_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ void UL_DisplayMemoryError( int memneeded ) {
12711271
=================
12721272
*/
12731273

1274-
void UL_printf( byte * str ) {
1274+
void UL_printf( const char * str ) {
12751275
#ifdef DOS
12761276
byte *s;
12771277
byte *screen;

rott/rt_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void VL_SetColor( int color, int red, int green, int blue );
8383
void VL_GetColor( int color, int * red, int * green, int * blue );
8484
void VL_SetPalette( byte * palette );
8585
void VL_GetPalette( byte * palette );
86-
void UL_printf( byte * str );
86+
void UL_printf( const char * str );
8787
void VL_NormalizePalette( byte * palette );
8888
void MapDebug( char * error, ... ) __attribute__((format(printf, 1, 2)));
8989
void OpenMapDebug( void );

rott/watcom.h

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,43 +17,13 @@ along with this program; if not, write to the Free Software
1717
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
1919
*/
20+
2021
#ifndef _watcom_h_public
2122
#define _watcom_h_public
23+
2224
fixed FixedMul( fixed a, fixed b );
2325
fixed FixedDiv2( fixed a, fixed b );
2426
fixed FixedScale( fixed orig, fixed factor, fixed divisor );
2527
fixed FixedMulShift( fixed a, fixed b, fixed shift );
26-
#ifdef __WATCOMC__
27-
#pragma aux FixedMul = \
28-
"imul ebx", \
29-
"add eax, 8000h" \
30-
"adc edx,0h" \
31-
"shrd eax,edx,16" \
32-
parm [eax] [ebx] \
33-
value [eax] \
34-
modify exact [eax edx]
35-
36-
#pragma aux FixedMulShift = \
37-
"imul ebx", \
38-
"shrd eax,edx,cl" \
39-
parm [eax] [ebx] [ecx]\
40-
value [eax] \
41-
modify exact [eax edx]
42-
43-
#pragma aux FixedDiv2 = \
44-
"cdq", \
45-
"shld edx,eax,16", \
46-
"sal eax,16", \
47-
"idiv ebx" \
48-
parm [eax] [ebx] \
49-
value [eax] \
50-
modify exact [eax edx]
51-
#pragma aux FixedScale = \
52-
"imul ebx", \
53-
"idiv ecx" \
54-
parm [eax] [ebx] [ecx]\
55-
value [eax] \
56-
modify exact [eax edx]
57-
#endif
5828

5929
#endif

0 commit comments

Comments
 (0)