Chopper

.gitignore

@@ -7,3 +7,5 @@ debug/*
 .vscode/*
 precalc/*
 *.code-workspace
+
+of

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "deps/ace"]
+	path = deps/ace
+	url = https://github.com/AmigaPorts/ACE

CMakeLists.txt

@@ -0,0 +1,82 @@
+cmake_minimum_required(VERSION 3.14.0)
+project(openFire LANGUAGES C)
+
+if(NOT AMIGA)
+	message(SEND_ERROR "This project only compiles for Amiga")
+endif()
+
+# ACE
+add_subdirectory(deps/ace ace)
+
+set(CMAKE_C_STANDARD 11)
+file(GLOB_RECURSE SOURCES src/*.c src/*.h)
+
+if(ELF2HUNK)
+	set(GAME_EXECUTABLE openFire.elf)
+	set(GAME_OUTPUT_EXECUTABLE openFire.exe)
+	add_executable(${GAME_EXECUTABLE} ${SOURCES})
+	target_link_libraries(${GAME_EXECUTABLE} -Wl,-Map=openFire.map)
+
+	if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug") AND NOT (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+		set(ELF2HUNK_ARGS ${ELF2HUNK_ARGS} -s)
+	endif()
+
+	add_custom_command(
+		TARGET ${GAME_EXECUTABLE} POST_BUILD
+		COMMAND ${ELF2HUNK} ${GAME_EXECUTABLE} ${GAME_OUTPUT_EXECUTABLE} ${ELF2HUNK_ARGS}
+	)
+	add_custom_command(
+		TARGET ${GAME_EXECUTABLE} POST_BUILD
+		COMMAND ${OBJDUMP} --disassemble -S ${GAME_EXECUTABLE} > openFire.s
+	)
+else()
+	SET(GAME_EXECUTABLE openFire)
+	SET(GAME_OUTPUT_EXECUTABLE openFire)
+	add_executable(${GAME_EXECUTABLE} ${SOURCES})
+endif()
+
+# Version stuff
+string(TIMESTAMP YEAR "%y")
+string(TIMESTAMP DAY "%d")
+string(TIMESTAMP MONTH "%m")
+MATH(EXPR VER_MAJOR "0 + ${YEAR}")
+MATH(EXPR VER_MINOR "0 + ${MONTH}")
+MATH(EXPR VER_FIX "0 + ${DAY}")
+set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_FIX}")
+target_compile_definitions(${GAME_EXECUTABLE} PRIVATE GAME_VERSION="${VERSION}")
+
+target_include_directories(${GAME_EXECUTABLE} PRIVATE ${PROJECT_SOURCE_DIR}/src)
+target_compile_options(${GAME_EXECUTABLE} PUBLIC -Wall)
+target_link_libraries(${GAME_EXECUTABLE} ace)
+if(GAME_DEBUG)
+	target_compile_definitions(${GAME_EXECUTABLE} PRIVATE GAME_DEBUG)
+	target_compile_definitions(ace PUBLIC ACE_DEBUG_UAE)
+endif()
+
+set(RES_DIR ${CMAKE_CURRENT_LIST_DIR}/res)
+set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}/data)
+set(GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated)
+file(MAKE_DIRECTORY ${DATA_DIR} ${GEN_DIR})
+
+file(COPY "data" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+# Generating ZIP
+set(GAME_PACKAGE_NAME "${CMAKE_PROJECT_NAME} ${VER_MAJOR}_${VER_MINOR}_${VER_FIX}")
+add_custom_target(generateZip COMMAND
+	${CMAKE_COMMAND} -E tar "cf" "${GAME_PACKAGE_NAME}.zip" --format=zip
+	"${CMAKE_CURRENT_BINARY_DIR}/${GAME_OUTPUT_EXECUTABLE}" "${DATA_DIR}"
+	COMMENT "Generating ZIP file ${GAME_PACKAGE_NAME}.zip"
+)
+
+# Generating ADF
+set(ADF_DIR "${CMAKE_CURRENT_BINARY_DIR}/adf")
+add_custom_target(generateAdf
+	COMMAND ${CMAKE_COMMAND} -E make_directory "${ADF_DIR}/s"
+	COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/${GAME_OUTPUT_EXECUTABLE}" "${ADF_DIR}"
+	COMMAND ${CMAKE_COMMAND} -E copy_directory "${DATA_DIR}" "${ADF_DIR}/data"
+	# COMMAND ${CMAKE_COMMAND} -E echo "c:add21k" > "${ADF_DIR}/s/startup-sequence"
+	COMMAND ${CMAKE_COMMAND} -E echo "${GAME_OUTPUT_EXECUTABLE}" > "${ADF_DIR}/s/startup-sequence"
+	COMMAND exe2adf -l ${CMAKE_PROJECT_NAME} -a "${GAME_PACKAGE_NAME}.adf" -d ${ADF_DIR}
+	COMMAND ${CMAKE_COMMAND} -E rm -rf "${ADF_DIR}"
+	COMMENT "Generating ADF file ${GAME_PACKAGE_NAME}.adf"
+)

README.md

@@ -12,16 +12,20 @@ As the game is still under development, game performance will vary.
 * Mouse and keyboard
 
 ## How to play
+
 After starting game, you may choose your team and vehicle. The goal of the game is to conquer more bases than enemy team and maintain this state until enemy team runs out of respawn points.
 
 ## Controls
+
 * Movement: <kbd>W</kbd>, <kbd>S</kbd>, <kbd>A</kbd>, <kbd>D</kbd>
 * Fire, hiding in bunker: <kbd>LMB</kbd>
+* Show FPS: <kbd>F1</kbd>
 * Exit: <kbd>ESC</kbd>
 
 ## Authors
 
-This game has been made as entry for [RetroKomp](http://retrokomp.org) Gamedev Compo 2017. Original authors are:
+This game has been made as entry for
+[RetroKomp](http://retrokomp.org) Gamedev Compo 2017. Original authors are:
 
 * KaiN - code
 * Selur - gfx

makefile

@@ -45,7 +45,7 @@ ifeq ($(OF_CC), vc)
 	AS_FLAGS = +kick13 -c
 	OBJDUMP =
 else ifeq ($(OF_CC), m68k-amigaos-gcc)
-	CC_FLAGS = -std=gnu11 $(INCLUDES) -DAMIGA -noixemul -Wall -Wextra -fomit-frame-pointer -O3 -fbbb=abcfilmprsz
+	CC_FLAGS = -std=gnu11 $(INCLUDES) -DAMIGA -noixemul -Wall -Wextra -fomit-frame-pointer -O3
 	AS_FLAGS = -quiet -x -m68010 -Faout
 	OBJDUMP = m68k-amigaos-objdump -S -d $@ > [email protected]
 endif
@@ -80,6 +80,7 @@ of: $(OF_OBJS) $(ACE_OBJS_CP)
 	$(NEWLINE)
 	@echo Linking...
 	@$(OF_CC) $(CC_FLAGS) -lamiga -o $@ $^
+	@m68k-amigaos-size $@
 
 ace: $(ACE_OBJS)
 	$(MAKE) -C $(ACE_DIR) all ACE_CC=$(OF_CC) TARGET=$(TARGET)

src/adler32.c

@@ -30,8 +30,7 @@ ULONG adler32file(const char *szPath) {
 		goto fail;
 	}
 	UBYTE ubBfr;
-	while(!fileIsEof(pFile)) {
-		fileRead(pFile, &ubBfr, 1);
+	while(fileRead(pFile, &ubBfr, 1)) {
 		a += ubBfr;
 		if(a >= ADLER32_MODULO) {
 			a -= ADLER32_MODULO;

src/cursor.c

@@ -25,19 +25,17 @@ void cursorUpdate(void) {
 
 void cursorCreate(tView *pView, FUBYTE fubSpriteIdx, char *szPath, UWORD uwRawCopPos) {
 	mouseSetBounds(MOUSE_PORT_1, 0, 0, 320, 255);
-	s_pCrosshair = bitmapCreateFromFile(szPath);
+	s_pCrosshair = bitmapCreateFromFile(szPath, 0);
 	UWORD *pSpriteBfr = (UWORD*)((void*)s_pCrosshair->Planes[0]);
 	cursorUpdate();
 	ULONG ulSprAddr = (ULONG)((UBYTE*)pSpriteBfr);
 	if(pView->pCopList->ubMode == COPPER_MODE_RAW) {
 		tCopCmd *pCrossList = &pView->pCopList->pBackBfr->pList[uwRawCopPos];
 		copSetMove(&pCrossList[0].sMove, &g_pSprFetch[fubSpriteIdx].uwHi, ulSprAddr >> 16);
 		copSetMove(&pCrossList[1].sMove, &g_pSprFetch[fubSpriteIdx].uwLo, ulSprAddr & 0xFFFF);
-		CopyMemQuick(
-			&pView->pCopList->pBackBfr->pList[uwRawCopPos],
-			&pView->pCopList->pFrontBfr->pList[uwRawCopPos],
-			2*sizeof(tCopCmd)
-		);
+		for(UBYTE i = 0; i < 2; ++i) {
+			pView->pCopList->pFrontBfr->pList[uwRawCopPos + i].ulCode = pView->pCopList->pBackBfr->pList[uwRawCopPos + i].ulCode;
+		}
 	}
 	else {
 		tCopBlock *pBlock = copBlockCreate(pView->pCopList, 2, 0, 0);

src/gamestates/game/ai/bot.c

@@ -172,7 +172,7 @@ static tAiNode *botFindNewTarget(tBot *pBot, tAiNode *pDestToEvade) {
 static tTurret *botTargetNearbyTurret(tBot *pBot, UBYTE ubEnemyTeam) {
 	UWORD uwBotTileX = pBot->pPlayer->sVehicle.uwX >> MAP_TILE_SIZE;
 	UWORD uwBotTileY = pBot->pPlayer->sVehicle.uwY >> MAP_TILE_SIZE;
-	UBYTE ubOctant = ((pBot->pPlayer->sVehicle.ubTurretAngle+8) & ANGLE_LAST) >> 4;
+	UBYTE ubOctant = ((pBot->pPlayer->sVehicle.ubAuxAngle + 8) & ANGLE_LAST) / 16;
 
 	tBCoordYX *pTargetingOrder = s_pTargetingOrders[ubOctant];
 	for(UBYTE i = 0; i != BOT_TARGETING_FLAT_SIZE; ++i) {

src/gamestates/game/bob_new.c

@@ -6,6 +6,7 @@
 #include <ace/managers/memory.h>
 #include <ace/managers/system.h>
 #include <ace/utils/custom.h>
+#include <gamestates/game/game.h>
 
 // Undraw stack must be accessible during adding new bobs, so the most safe
 // approach is to have two lists - undraw list gets populated after draw
@@ -67,9 +68,11 @@ void bobNewManagerDestroy(void) {
 }
 
 void bobNewPush(tBobNew *pBob) {
-	tBobQueue *pQueue = &s_pQueues[s_ubBufferCurr];
-	pQueue->pBobs[s_ubBobsPushed] = pBob;
-	++s_ubBobsPushed;
+	if(steerRequestIsLast()) {
+		tBobQueue *pQueue = &s_pQueues[s_ubBufferCurr];
+		pQueue->pBobs[s_ubBobsPushed] = pBob;
+		++s_ubBobsPushed;
+	}
 	if(blitIsIdle()) {
 		bobNewProcessNext();
 	}
@@ -89,12 +92,12 @@ void bobNewInit(
 	pBob->_wModuloUndrawSave = bitmapGetByteWidth(s_pQueues[0].pDst) - uwBlitWords*2;
 	pBob->uwOffsetY = 0;
 
-	pBob->sPos.sUwCoord.uwX = uwX;
-	pBob->sPos.sUwCoord.uwY = uwY;
-	pBob->pOldPositions[0].sUwCoord.uwX = uwX;
-	pBob->pOldPositions[0].sUwCoord.uwY = uwY;
-	pBob->pOldPositions[1].sUwCoord.uwX = uwX;
-	pBob->pOldPositions[1].sUwCoord.uwY = uwY;
+	pBob->sPos.uwX = uwX;
+	pBob->sPos.uwY = uwY;
+	pBob->pOldPositions[0].uwX = uwX;
+	pBob->pOldPositions[0].uwY = uwY;
+	pBob->pOldPositions[1].uwX = uwX;
+	pBob->pOldPositions[1].uwY = uwY;
 }
 
 void bobNewSetBitMapOffset(tBobNew *pBob, UWORD uwOffsetY) {
@@ -121,8 +124,8 @@ UBYTE bobNewProcessNext(void) {
 		++s_ubBobsSaved;
 		if(pBob->isUndrawRequired) {
 			ULONG ulSrcOffs = (
-				pQueue->pDst->BytesPerRow * pBob->sPos.sUwCoord.uwY +
-				pBob->sPos.sUwCoord.uwX/8
+				pQueue->pDst->BytesPerRow * pBob->sPos.uwY +
+				pBob->sPos.uwX/8
 			);
 			ULONG ulA = (ULONG)(pQueue->pDst->Planes[0]) + ulSrcOffs;
 			g_pCustom->bltamod = pBob->_wModuloUndrawSave;
@@ -145,13 +148,13 @@ UBYTE bobNewProcessNext(void) {
 
 			if(!blitCheck(
 				pBob->pBitmap, 0, pBob->uwOffsetY / pBob->pBitmap->BytesPerRow,
-				pQueue->pDst, pPos->sUwCoord.uwX, pPos->sUwCoord.uwY,
+				pQueue->pDst, pPos->uwX, pPos->uwY,
 				pBob->uwWidth, pBob->uwHeight, __LINE__, __FILE__
 			)) {
 				return 1;
 			}
 
-			UBYTE ubDstOffs = pPos->sUwCoord.uwX & 0xF;
+			UBYTE ubDstOffs = pPos->uwX & 0xF;
 			UWORD uwBlitWidth = (pBob->uwWidth +ubDstOffs+15) & 0xFFF0;
 			UWORD uwBlitWords = uwBlitWidth >> 4;
 			UWORD uwBlitSize = ((pBob->uwHeight * s_ubBpp) << 6) | uwBlitWords;
@@ -169,7 +172,7 @@ UBYTE bobNewProcessNext(void) {
 			}
 			ULONG ulSrcOffs = pBob->uwOffsetY;
 			ULONG ulDstOffs = (
-				pQueue->pDst->BytesPerRow * pPos->sUwCoord.uwY + (pPos->sUwCoord.uwX>>3)
+				pQueue->pDst->BytesPerRow * pPos->uwY + (pPos->uwX>>3)
 			);
 
 			WORD wDstModulo = bitmapGetByteWidth(pQueue->pDst) - (uwBlitWords<<1);
@@ -201,6 +204,9 @@ UBYTE bobNewProcessNext(void) {
 }
 
 void bobNewBegin(void) {
+	if(!steerRequestIsFirst()) {
+		return;
+	}
 	tBobQueue *pQueue = &s_pQueues[s_ubBufferCurr];
 
 	// Prepare for undraw
@@ -222,8 +228,8 @@ void bobNewBegin(void) {
 		if(pBob->isUndrawRequired) {
 			// Undraw next
 			ULONG ulDstOffs = (
-				pQueue->pDst->BytesPerRow * pBob->pOldPositions[s_ubBufferCurr].sUwCoord.uwY +
-				pBob->pOldPositions[s_ubBufferCurr].sUwCoord.uwX/8
+				pQueue->pDst->BytesPerRow * pBob->pOldPositions[s_ubBufferCurr].uwY +
+				pBob->pOldPositions[s_ubBufferCurr].uwX/8
 			);
 			ULONG ulCD = (ULONG)(pQueue->pDst->Planes[0]) + ulDstOffs;
 			g_pCustom->bltdmod = pBob->_wModuloUndrawSave;
@@ -253,7 +259,9 @@ void bobNewBegin(void) {
 }
 
 void bobNewPushingDone(void) {
-	s_isPushingDone = 1;
+	if(steerRequestIsLast()) {
+		s_isPushingDone = 1;
+	}
 }
 
 void bobNewEnd(void) {

src/gamestates/game/console.c

@@ -47,7 +47,7 @@ void consoleWrite(const char *szMsg, UBYTE ubColor) {
 	s_sLog.pLog[s_sLog.uwTailIdx].ubColor = ubColor;
 #ifdef GAME_DEBUG
 	if(strlen(szMsg) > CHAT_MAX) {
-		logWrite("ERR: Text too long (%d): '%s'\n", strlen(szMsg), szMsg);
+		logWrite("ERR: Text too long (%ld): '%s'\n", strlen(szMsg), szMsg);
 		return;
 	}
 #endif
@@ -63,9 +63,12 @@ void consoleUpdate(void) {
 		return;
 	}
 
-	if(fontFillTextBitMap(
+	if(fontTextFitsInTextBitmap(
 		s_pConsoleFont, s_pChatLineBfr, s_sLog.pLog[s_uwToDraw].szMessage
 	)) {
+		fontFillTextBitMap(
+			s_pConsoleFont, s_pChatLineBfr, s_sLog.pLog[s_uwToDraw].szMessage
+		);
 		// Move remaining messages up
 		blitCopyAligned(
 			g_pHudBfr->pBack, 112, 9,

src/gamestates/game/control.c

@@ -6,7 +6,7 @@
 #include "gamestates/game/game.h"
 #include "gamestates/game/console.h"
 
-#define CONTROL_POINT_LIFE 250 /* 15s */
+#define CONTROL_POINT_LIFE 256 /* 15s */
 #define CONTROL_POINT_LIFE_RED   0
 #define CONTROL_POINT_LIFE_NEUTRAL (CONTROL_POINT_LIFE)
 #define CONTROL_POINT_LIFE_BLUE   (CONTROL_POINT_LIFE*2)
@@ -61,10 +61,10 @@ static UBYTE ** controlPolygonMaskCreate(
 
 	*pX1 = 0xFF; *pY1 = 0xFF; *pX2 = 0; *pY2 = 0;
 	for(FUBYTE i = 1; i < fubPolyPtCnt; ++i) {
-		FUBYTE x1 = pPolyPts[i-1].sUbCoord.ubX;
-		FUBYTE y1 = pPolyPts[i-1].sUbCoord.ubY;
-		FUBYTE x2 = pPolyPts[i].sUbCoord.ubX;
-		FUBYTE y2 = pPolyPts[i].sUbCoord.ubY;
+		FUBYTE x1 = pPolyPts[i-1].ubX;
+		FUBYTE y1 = pPolyPts[i-1].ubY;
+		FUBYTE x2 = pPolyPts[i].ubX;
+		FUBYTE y2 = pPolyPts[i].ubY;
 
 		FUBYTE fubStartX = MIN(x1, x2);
 		FUBYTE fubEndX = MAX(x1, x2);

src/gamestates/game/data.c

@@ -65,7 +65,7 @@ void dataForcePlayerState(tPlayer *pPlayer, tVehicleState *pState) {
 		pPlayer->sVehicle.uwX = fix16_to_int(pState->fX);
 		pPlayer->sVehicle.uwY = fix16_to_int(pState->fY);
 		pPlayer->sVehicle.ubBodyAngle = pState->ubBodyAngle;
-		pPlayer->sVehicle.ubTurretAngle = pState->ubTurretAngle;
+		pPlayer->sVehicle.ubAuxAngle = pState->ubAuxAngle;
 		// TODO: destination angle
 		// TODO: delta x,y
 		if(pPlayer->ubCurrentVehicleType != pState->ubVehicleType) {

src/gamestates/game/data.h

@@ -30,7 +30,7 @@ typedef struct _tVehicleState {
 	fix16_t fX;          ///< Vehicle X-position relative to center of gfx.
 	fix16_t fY;          ///< Ditto, vehicle Y.
 	UBYTE ubBodyAngle;   ///< Measured clockwise, +90deg is to bottom.
-	UBYTE ubTurretAngle; ///< NOT relative to body angle, measured as above.
+	UBYTE ubAuxAngle;    ///< NOT relative to body angle, measured as above.
 	// Aligned with ubDestAngle
 	UBYTE ubVehicleType;  ///< Could be combined with ubVehicleState per nibble
 	UBYTE ubPlayerState;  ///< DEAD, SURFACING, etc.

src/gamestates/game/explosions.c

@@ -20,8 +20,8 @@ void explosionsAdd(UWORD uwX, UWORD uwY) {
 	for(UWORD i = EXPLOSIONS_MAX; i--;) {
 		if(s_pExplosions[i].uwDuration >= EXPLOSION_DURATION) {
 			// Free slot found - setup explosion
-			s_pExplosions[i].sBob.sPos.sUwCoord.uwX = uwX - EXPLOSION_SIZE/2;
-			s_pExplosions[i].sBob.sPos.sUwCoord.uwY = uwY - EXPLOSION_SIZE/2;
+			s_pExplosions[i].sBob.sPos.uwX = uwX - EXPLOSION_SIZE/2;
+			s_pExplosions[i].sBob.sPos.uwY = uwY - EXPLOSION_SIZE/2;
 			s_pExplosions[i].uwDuration = 0;
 			return;
 		}
@@ -30,8 +30,8 @@ void explosionsAdd(UWORD uwX, UWORD uwY) {
 
 void explosionsCreate(void) {
 	logBlockBegin("explosionsCreate()");
-	s_pBitmap = bitmapCreateFromFile("data/explosion.bm");
-	s_pMask = bitmapCreateFromFile("data/explosion_mask.bm");
+	s_pBitmap = bitmapCreateFromFile("data/explosion.bm", 0);
+	s_pMask = bitmapCreateFromFile("data/explosion_mask.bm", 0);
 
 	for(UBYTE i = EXPLOSIONS_MAX; i--;) {
 		bobNewInit(&s_pExplosions[i].sBob, 32, 32, 1, s_pBitmap, s_pMask, 0, 0);