aboutsummaryrefslogtreecommitdiffstats
path: root/demos/3rdparty/doom/r_main.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-12-24 19:58:18 +1000
committerinmarket <andrewh@inmarket.com.au>2013-12-24 19:58:18 +1000
commit0345dadebf55980d765826e32854049e498d5759 (patch)
treeaa500fb65cda08d165dc2a66062beedcbdcb30fc /demos/3rdparty/doom/r_main.c
parentc24512f6edaee109ac10c378e7e89218c48255b7 (diff)
downloaduGFX-0345dadebf55980d765826e32854049e498d5759.tar.gz
uGFX-0345dadebf55980d765826e32854049e498d5759.tar.bz2
uGFX-0345dadebf55980d765826e32854049e498d5759.zip
Fixes to DOOM demo to remove some operating system dependancies.
Also now has working input (although not perfect) - Needs mouse or touch. Also now supports screen size doubling when the screen is significantly larger than doom's screen.
Diffstat (limited to 'demos/3rdparty/doom/r_main.c')
-rw-r--r--demos/3rdparty/doom/r_main.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/demos/3rdparty/doom/r_main.c b/demos/3rdparty/doom/r_main.c
index ad942c7c..abfcb833 100644
--- a/demos/3rdparty/doom/r_main.c
+++ b/demos/3rdparty/doom/r_main.c
@@ -40,6 +40,8 @@ static const char rcsid[] = "$Id: r_main.c,v 1.5 1997/02/03 22:45:12 b1 Exp $";
#include "r_local.h"
#include "r_sky.h"
+#include "i_system.h"
+
@@ -110,7 +112,7 @@ angle_t xtoviewangle[SCREENWIDTH+1];
// fixed_t finetangent[FINEANGLES/2];
// fixed_t finesine[5*FINEANGLES/4];
-fixed_t* finecosine = &finesine[FINEANGLES/4];
+const fixed_t* finecosine = &finesine[FINEANGLES/4];
lighttable_t* scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
@@ -773,22 +775,22 @@ extern int screenblocks;
void R_Init (void)
{
R_InitData ();
- printf ("\nR_InitData");
+ I_printf ("\nR_InitData");
R_InitPointToAngle ();
- printf ("\nR_InitPointToAngle");
+ I_printf ("\nR_InitPointToAngle");
R_InitTables ();
// viewwidth / viewheight / detailLevel are set by the defaults
- printf ("\nR_InitTables");
+ I_printf ("\nR_InitTables");
R_SetViewSize (screenblocks, detailLevel);
R_InitPlanes ();
- printf ("\nR_InitPlanes");
+ I_printf ("\nR_InitPlanes");
R_InitLightTables ();
- printf ("\nR_InitLightTables");
+ I_printf ("\nR_InitLightTables");
R_InitSkyMap ();
- printf ("\nR_InitSkyMap");
+ I_printf ("\nR_InitSkyMap");
R_InitTranslationTables ();
- printf ("\nR_InitTranslationsTables");
+ I_printf ("\nR_InitTranslationsTables");
framecount = 0;
}