enum fix, flto, changed 3d view to angle change

Author: elhobbs

Makefile

@@ -19,9 +19,9 @@ include $(DEVKITARM)/3ds_rules
 #---------------------------------------------------------------------------------
 export TARGET		:=	$(shell basename $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	src arm9/source arm11/source khax
+SOURCES		:=	src arm9/source arm11/source helix/fixpt helix/fixpt/real helix/fixpt/real/arm khax
 DATA		:=	dat
-INCLUDES	:=	include src arm9/include arm11/include khax
+INCLUDES	:=	include src arm9/include arm11/include helix/fixpt/pub khax
 APP_TITLE	:=	prboom
 APP_DESCRIPTION	:= prboom for the 3ds
 APP_AUTHOR	:= elhobbs
@@ -39,14 +39,19 @@ CFLAGS2	:=	-g -Wall -O2 -mword-relocations -save-temps \
 			-fomit-frame-pointer -ffast-math \
 			$(ARCH)
 
-CFLAGS	:=	-g -Wall -mword-relocations \
+CFLAGS	:=	-g -Wall -mword-relocations -flto \
 			-ffunction-sections \
 			-fdata-sections \
-			-fno-short-enums \
 			$(ARCH) \
 			-O2
 
-CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -DHAVE_CONFIG_H
+CFLAGS3	:=	-g -Wall -mword-relocations \
+			-ffunction-sections \
+			-fdata-sections \
+			$(ARCH) \
+			-O0
+
+CFLAGS	+=	$(INCLUDE) -DARM11 -DARM -D_3DS -DHAVE_CONFIG_H
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 

arm11/source/dbopl.h

@@ -74,6 +74,7 @@ typedef enum {
   sm6Start,
   sm2Percussion,
   sm3Percussion,
+  sm3_max = 0xffffffffL
 } SynthMode;
 
 //Shifts for the values contained in chandata variable
@@ -96,6 +97,7 @@ typedef enum {
         SUSTAIN,
         DECAY,
         ATTACK,
+		operstatemax_max = 0xffffffffL
 } OperatorState;
 
 struct _Operator {

arm11/source/musplay.c

@@ -724,7 +724,7 @@ byte* mus_load_music(u8 *data)
 		header->ID[2] != 'S' ||
 		header->ID[3] != 0x1A)
 	{
-		printf("mus_load_music: failed\n");
+		printf("mus_load_music: failed type %c %c %c\n", header->ID[0], header->ID[1], header->ID[2]);
 		return 0;
 	}
 

arm11/source/musplay.h

@@ -166,7 +166,8 @@ typedef unsigned char u8;
 typedef enum {
 	MUS_IDLE,
 	MUS_PLAYING,
-	MUS_EXIT
+	MUS_EXIT,
+	MUS_max = 0xffffffffL
 } MUS_STATE;
 
 void mus_init();

arm11/source/opl.h

@@ -32,7 +32,8 @@ typedef void (*opl_callback_t)(void *data);
 typedef enum
 {
     OPL_REGISTER_PORT = 0,
-    OPL_DATA_PORT = 1
+    OPL_DATA_PORT = 1,
+	OPL_max = 0xffffffffL
 } opl_port_t;
 
 #define OPL_NUM_OPERATORS   21

prboom3ds.3ds

@@ -49,7 +49,8 @@ typedef enum
   ev_keydown,
   ev_keyup,
   ev_mouse,
-  ev_joystick
+  ev_joystick,
+  ev_max = 0xffffffffL
 } evtype_t;
 
 // Event structure.
@@ -73,6 +74,7 @@ typedef enum
   ga_completed,
   ga_victory,
   ga_worlddone,
+  ga_max = 0xffffffffL
 } gameaction_t;
 
 
@@ -112,7 +114,7 @@ typedef enum
   // Savegame slot numbers occupy the second byte of buttons.
   BTS_SAVEMASK    = (4+8+16),
   BTS_SAVESHIFT   = 2,
-
+  TBS_MAX = 0xffffffffL
 } buttoncode_t;
 
 

prboom3ds.3dsx

@@ -60,8 +60,8 @@
 typedef enum
 {
     CMD_SEND    = 1,
-    CMD_GET     = 2
-
+    CMD_GET     = 2,
+	CMD_max = 0xffffffffL
 } command_t;
 
 
@@ -128,6 +128,7 @@ typedef enum {
   // Leave space, so low values corresponding to normal netgame setup packets can be ignored
   nm_plcolour = 3,
   nm_savegamename = 4,
+  nm_max = 0xffffffffL
 } netmisctype_t;
 
 typedef struct