Integrated OpenArena build into main build.

.gitignore

@@ -8,6 +8,7 @@
 *.pk3
 *.cfg
 *.zip
+datafiles/*
 
 # Windows image file caches
 Thumbs.db

Makefile

@@ -52,7 +52,7 @@ $(TARGET).vpk: $(TARGET).velf
 	cp -f param.sfo build/sce_sys/param.sfo
 
 	#------------ Comment this if you don't have 7zip ------------------
-	7z a -tzip ./$(TARGET).vpk -r ./build/sce_sys ./build/eboot.bin
+	7z a -tzip ./$(TARGET).vpk -r ./build/sce_sys ./build/eboot.bin ./build/openarena.bin
 	#-------------------------------------------------------------------
 
 eboot.bin: $(TARGET).velf

Makefile.openarena

-TARGET		:= vitaOpenArena
-TITLE		:= OPENARENA
+TARGET		:= openarena
 GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags)
 
 SOURCES  := code/renderercommon code/qcommon code/botlib code/client code/server code/renderergl1 code/psp2 code/sys
@@ -30,16 +29,10 @@ CFLAGS  = $(INCLUDE) -D__PSP2__ -D__FLOAT_WORD_ORDER=1 -D__GNU__ -DRELEASE \
 CXXFLAGS  = $(CFLAGS) -fno-exceptions -std=gnu++11
 ASFLAGS = $(CFLAGS)
 
-all: $(TARGET).vpk
+all: $(TARGET).bin
 
-$(TARGET).vpk: $(TARGET).velf
-	vita-make-fself -s $< build_oa/eboot.bin
-	vita-mksfoex -s TITLE_ID=$(TITLE) -d ATTRIBUTE2=12 "$(TARGET)" param.sfo
-	cp -f param.sfo build_oa/sce_sys/param.sfo
-
-	#------------ Comment this if you don't have 7zip ------------------
-	7z a -tzip ./$(TARGET).vpk -r ./build_oa/sce_sys ./build_oa/eboot.bin
-	#-------------------------------------------------------------------
+$(TARGET).bin: $(TARGET).velf
+	vita-make-fself -s $< build/$(TARGET).bin
 
 %.velf: %.elf
 	cp $< $<.unstripped.elf

build/sce_sys/livearea/contents/template.xml

@@ -15,4 +15,12 @@
 			<image>teamarena.png</image>
 		</liveitem>
 	</frame>
+	
+	<frame id='frame2' multi='o' autoflip='3' >
+		<liveitem>
+			<target>psla:open</target>
+			<image>openarena.png</image>
+		</liveitem>
+	</frame>
+	
 </livearea>

build_oa/sce_sys/livearea/contents/template.xml

-<?xml version="1.0" encoding="utf-8"?>
-
-<livearea style="a1" format-ver="01.00" content-rev="1">
-	<livearea-background>
-		<image>bg.png</image>
-	</livearea-background>
-	
-	<gate>
-		<startup-image>startup.png</startup-image>
-	</gate>
-</livearea>

code/psp2/sys_main.c

@@ -449,15 +449,20 @@ int quake_main (unsigned int argc, void* argv){
     Sys_SetBinaryPath(DEFAULT_BASEDIR);
     Sys_SetDefaultInstallPath(DEFAULT_BASEDIR);
 	
-	// Quake III: Team Arena support
+	// Quake III: Team Arena & OpenArena support
+#ifndef OPENARENA
 	sceAppUtilInit(&(SceAppUtilInitParam){}, &(SceAppUtilBootParam){});
 	SceAppUtilAppEventParam eventParam;
 	memset(&eventParam, 0, sizeof(SceAppUtilAppEventParam));
 	sceAppUtilReceiveAppEvent(&eventParam);
 	if (eventParam.type == 0x05){
-		sprintf(commandLine, "+set fs_game missionpack");
+		char buffer[2048];
+		memset(buffer, 0, 2048);
+		sceAppUtilAppEventParseLiveArea(&eventParam, buffer);
+		if (strstr(buffer, "open") != NULL) sceAppMgrLoadExec("app0:/openarena.bin", NULL, NULL); 
+		else sprintf(commandLine, "+set fs_game missionpack");
 	}
-
+#endif
     CON_Init();
     Com_Init(commandLine);
     NET_Init();