summaryrefslogtreecommitdiff
path: root/apps/plugins/doom/v_video.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-29 08:12:39 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-29 08:12:39 +0000
commit9c6e217f29bb0a76ec153574a3d493b020e5fb60 (patch)
treeb38acde6c091b7f8b0e3205645f9d232f19eeabb /apps/plugins/doom/v_video.c
parent6980c1e9988a7c959876ad77b760e042272a9ec2 (diff)
downloadrockbox-9c6e217f29bb0a76ec153574a3d493b020e5fb60.tar.gz
rockbox-9c6e217f29bb0a76ec153574a3d493b020e5fb60.zip
Doom plugin: In anticipation of moving to the EABI toolchain, because of its assumptions about enums being sized as ints, convert enum typdefs to int or unsigned depending upon whether they have negative values in the enumeration. This should effectively preserve the manner in which it is compiled under the old toolchain and avoids having to closely inspect and possibly change many places in the code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26368 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom/v_video.c')
-rw-r--r--apps/plugins/doom/v_video.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c
index a7e2baea16..76993ea5ee 100644
--- a/apps/plugins/doom/v_video.c
+++ b/apps/plugins/doom/v_video.c
@@ -208,7 +208,7 @@ void V_MarkRect(int x, int y, int width, int height)
208// 208//
209void V_CopyRect(int srcx, int srcy, int srcscrn, int width, 209void V_CopyRect(int srcx, int srcy, int srcscrn, int width,
210 int height, int destx, int desty, int destscrn, 210 int height, int destx, int desty, int destscrn,
211 enum patch_translation_e flags) 211 patch_translation_e flags)
212{ 212{
213 byte *src; 213 byte *src;
214 byte *dest; 214 byte *dest;
@@ -263,7 +263,7 @@ void V_CopyRect(int srcx, int srcy, int srcscrn, int width,
263// implemented, to support highres in the menus 263// implemented, to support highres in the menus
264// 264//
265void V_DrawBlock(int x, int y, int scrn, int width, int height, 265void V_DrawBlock(int x, int y, int scrn, int width, int height,
266 const byte *src, enum patch_translation_e flags) 266 const byte *src, patch_translation_e flags)
267{ 267{
268 byte *dest; 268 byte *dest;
269 269
@@ -406,7 +406,7 @@ void V_Init (void)
406// means that their inner loops weren't so well optimised, so merging code may even speed them). 406// means that their inner loops weren't so well optimised, so merging code may even speed them).
407// 407//
408void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, 408void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch,
409 int cm, enum patch_translation_e flags) 409 int cm, patch_translation_e flags)
410{ 410{
411 const byte *trans; 411 const byte *trans;
412 412
@@ -588,7 +588,7 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch,
588inline 588inline
589#endif 589#endif
590void V_DrawNumPatch(int x, int y, int scrn, int lump, 590void V_DrawNumPatch(int x, int y, int scrn, int lump,
591 int cm, enum patch_translation_e flags) 591 int cm, patch_translation_e flags)
592{ 592{
593 V_DrawMemPatch(x, y, scrn, (const patch_t*)W_CacheLumpNum(lump), 593 V_DrawMemPatch(x, y, scrn, (const patch_t*)W_CacheLumpNum(lump),
594 cm, flags); 594 cm, flags);
@@ -634,7 +634,7 @@ int V_NamePatchHeight(const char* name)
634// patch will be undefined (in fact black for now) 634// patch will be undefined (in fact black for now)
635 635
636byte *V_PatchToBlock(const char* name, int cm, 636byte *V_PatchToBlock(const char* name, int cm,
637 enum patch_translation_e flags, 637 patch_translation_e flags,
638 unsigned short* width, unsigned short* height) 638 unsigned short* width, unsigned short* height)
639{ 639{
640 (void)cm; 640 (void)cm;