Skip to content

Commit

Permalink
refactor EDirection_Utils to common
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheFakeMontyOnTheRun
TheFakeMontyOnTheRun committed Aug 22, 2023
1 parent 6511c8c commit cb50e7d
Show file tree
Hide file tree
Showing 22 changed files with 44 additions and 248 deletions.
0 ...rontend/base3d/include/EDirection_Utils.h → common/include/EDirection_Utils.h
View file
File renamed without changes.
0 ee_frontend/base3d/src/EDirection_Utils.c → common/src/EDirection_Utils.c
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ee_frontend/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ add_executable(derelict128
../common/src/Common.c
../common/src/FixP.c
../common/src/MapWithCharKey.c
../common/src/EDirection_Utils.c
base3d/src/Events.c
base3d/src/EDirection_Utils.c
SoundSystem/NullMusic.c
base3d/src/Dungeon.c
menu/src/UI.c
Expand Down
58 changes: 29 additions & 29 deletions ee_frontend/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,35 @@ EE_CFLAGS += -Ibase3d/include \
EE_BIN = derelict128.elf

EE_OBJS= menu/src/Main.o \
../common/src/FixP.o \
../common/src/Vec.o \
../common/src/Common.o \
../common/src/MapWithCharKey.o \
../common/src/ArrayPackedFileReader.o \
../common/src/CTile3DProperties.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
menu/src/Engine.o \
menu/src/UI.o \
menu/src/HackingScreen.o \
menu/src/BattleScreen.o \
menu/src/HelpScreen.o \
menu/src/CreditsScreen.o \
menu/src/Crawler.o \
../core/src/Derelict.o \
../core/src/Core.o \
../core/src/Parser.o \
SoundSystem/NullMusic.o \
base3d/src/ee/LoadBitmap.o \
base3d/src/ee/Renderer_Rasterization.o \
base3d/src/ee/Renderer_Tesselation.o \
base3d/src/ee/Renderer.o \
base3d/src/ee/EmotionEngineRenderer.o
../common/src/FixP.o \
../common/src/Vec.o \
../common/src/Common.o \
../common/src/MapWithCharKey.o \
../common/src/ArrayPackedFileReader.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
menu/src/Engine.o \
menu/src/UI.o \
menu/src/HackingScreen.o \
menu/src/BattleScreen.o \
menu/src/HelpScreen.o \
menu/src/CreditsScreen.o \
menu/src/Crawler.o \
../core/src/Derelict.o \
../core/src/Core.o \
../core/src/Parser.o \
SoundSystem/NullMusic.o \
base3d/src/ee/LoadBitmap.o \
base3d/src/ee/Renderer_Rasterization.o \
base3d/src/ee/Renderer_Tesselation.o \
base3d/src/ee/Renderer.o \
base3d/src/ee/EmotionEngineRenderer.o

all: $(EE_BIN)

Expand Down
2 changes: 1 addition & 1 deletion gl_frontend/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ add_executable(derelict64
../common/src/FixP.c
../common/src/MapWithCharKey.c
../common/src/PackedFileReader.c
../common/src/EDirection_Utils.c
base3d/src/Events.c
base3d/src/EDirection_Utils.c
SoundSystem/NullMusic.c
base3d/src/Dungeon.c
menu/src/UI.c
Expand Down
2 changes: 1 addition & 1 deletion gl_frontend/Makefile.SDL2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ MENU_OBJ= menu/src/Main.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
GL1Common/LoadBitmapGL1.o \
GL1Common/RendererGL1.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
GL1Common/Renderer_RasterizationGL1.o \
GL1Common/Renderer_TesselationGL1.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
Expand Down
2 changes: 1 addition & 1 deletion gl_frontend/Makefile.ntr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ CFILES := ../menu/src/MainMenu.c \
../../common/src/FixP.c \
../../common/src/MapWithCharKey.c \
../../common/src/PackedFileReader.c \
../../common/src/EDirection_Utils.c \
../base3d/src/Events.c \
../base3d/src/EDirection_Utils.c \
../SoundSystem/NullMusic.c \
../base3d/src/Dungeon.c \
../menu/src/UI.c \
Expand Down
2 changes: 1 addition & 1 deletion gl_frontend/Makefile.ultra
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ src = menu/src/MainMenu.c \
../common/src/FixP.c \
../common/src/MapWithCharKey.c \
../common/src/PackedFileReader.c \
../common/src/EDirection_Utils.c \
base3d/src/Events.c \
base3d/src/EDirection_Utils.c \
SoundSystem/NullMusic.c \
base3d/src/Dungeon.c \
menu/src/UI.c \
Expand Down
12 changes: 0 additions & 12 deletions gl_frontend/base3d/include/EDirection_Utils.h
View file

This file was deleted.

90 changes: 0 additions & 90 deletions gl_frontend/base3d/src/EDirection_Utils.c
View file

This file was deleted.

2 changes: 1 addition & 1 deletion mx_frontend/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ add_executable(derelict32
../common/src/FixP.c
../common/src/MapWithCharKey.c
../common/src/PackedFileReader.c
../common/src/EDirection_Utils.c
base3d/src/Events.c
base3d/src/CRenderer_Rasterization.c
base3d/src/EDirection_Utils.c
base3d/src/CRenderer_Tesselation.c
SoundSystem/NullMusic.c
base3d/src/Dungeon.c
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.DOS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ MENU_OBJ= menu/src/Main.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
SoundSystem/MusicDOS.o \
SoundSystem/timer.o \
SoundSystem/OPL2.o \
Expand All @@ -60,7 +61,6 @@ MENU_OBJ= menu/src/Main.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/CRenderer_Tesselation.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.SDL1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ MENU_OBJ= menu/src/Main.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
base3d/src/LoadBitmap.o \
base3d/src/CRenderer.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/CRenderer_Tesselation.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.SDL2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ MENU_OBJ= menu/src/Main.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
base3d/src/LoadBitmap.o \
base3d/src/CRenderer.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/CRenderer_Tesselation.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.X11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ MENU_OBJ= menu/src/Main.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
base3d/src/LoadBitmap.o \
base3d/src/CRenderer.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/CRenderer_Tesselation.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.aga
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ MENU_OBJ= menu/src/Main.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
base3d/src/LoadBitmap.o \
base3d/src/CRenderer.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/CRenderer_Tesselation.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.ags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ CFILES := ../menu/src/MainMenu.c \
../../common/src/Common.c \
../../common/src/FixP.c \
../../common/src/MapWithCharKey.c \
../../common/src/EDirection_Utils.o \
../base3d/src/Events.c \
../base3d/src/CRenderer_Rasterization.c \
../base3d/src/EDirection_Utils.c \
../base3d/src/CRenderer_Tesselation.c \
../SoundSystem/NullMusic.c \
../base3d/src/Dungeon.c \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.cd32
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ MENU_OBJ= menu/src/Main.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
base3d/src/LoadBitmap.o \
base3d/src/CRenderer.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Globals.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/CRenderer_Tesselation.o \
base3d/src/EDirection_Utils.o \
base3d/src/Dungeon.o \
menu/src/GameMenu.o \
menu/src/MainMenu.o \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ MENU_OBJ=menu/src/MainMenu.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
menu/src/Crawler.o \
menu/src/Engine.o \
menu/src/UI.o \
Expand All @@ -36,7 +37,6 @@ MENU_OBJ=menu/src/MainMenu.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/EDirection_Utils.o \
base3d/src/CRenderer_Tesselation.o \
SoundSystem/NullMusic.o \
menu/src/HelpScreen.o \
Expand Down
2 changes: 1 addition & 1 deletion mx_frontend/Makefile.webos
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ MENU_OBJ=menu/src/MainMenu.o \
../common/src/PackedFileReader.o \
../common/src/MapWithCharKey.o \
../common/src/CTile3DProperties.o \
../common/src/EDirection_Utils.o \
menu/src/Crawler.o \
menu/src/Engine.o \
menu/src/UI.o \
Expand All @@ -36,7 +37,6 @@ MENU_OBJ=menu/src/MainMenu.o \
base3d/src/VisibilityStrategy.o \
base3d/src/Events.o \
base3d/src/CRenderer_Rasterization.o \
base3d/src/EDirection_Utils.o \
base3d/src/CRenderer_Tesselation.o \
SoundSystem/NullMusic.o \
menu/src/HelpScreen.o \
Expand Down
12 changes: 0 additions & 12 deletions mx_frontend/base3d/include/EDirection_Utils.h
View file

This file was deleted.

Loading

0 comments on commit cb50e7d

Please sign in to comment.