Skip to content
Permalink
Browse files

Alpha 2.0rc3, "So close yet so far."

- Added soundtrack attribution
- Improved soundtrack selector
- Removed old source files
- Fixed some GCC garbage with floats and doubles
- Updated Code::Blocks project file to compile correctly
- Updated Makefile, hopefully fixes compilation on Linux
  • Loading branch information
YellowberryHN committed Oct 31, 2019
1 parent 22455c2 commit b7d9e61aeb1160f87f4a6099c69c2cd38004d72b
BIN -244 KB (98%) bin64/cardboard_msvc.ilk
Binary file not shown.
BIN -2.31 MB (86%) bin64/cardboard_msvc.pdb
Binary file not shown.

This file was deleted.

@@ -0,0 +1,12 @@
@ECHO OFF

set CARD_BIN=bin

IF /I "%PROCESSOR_ARCHITECTURE%" == "amd64" (
set CARD_BIN=bin64
)
IF /I "%PROCESSOR_ARCHITEW6432%" == "amd64" (
set CARD_BIN=bin64
)

start %CARD_BIN%\cardboard_mingw.exe "-q$HOME\My Games\Project Crimson Alpha" -glog.txt %*
@@ -1,12 +1,12 @@
@ECHO OFF

set SAUER_BIN=bin
set CARD_BIN=bin

IF /I "%PROCESSOR_ARCHITECTURE%" == "amd64" (
set SAUER_BIN=bin64
set CARD_BIN=bin64
)
IF /I "%PROCESSOR_ARCHITEW6432%" == "amd64" (
set SAUER_BIN=bin64
set CARD_BIN=bin64
)

start %SAUER_BIN%\cardboard_msvc.exe "-q$HOME\My Games\Project Crimson Alpha" -glog.txt %*
start %CARD_BIN%\cardboard_msvc.exe "-q$HOME\My Games\Project Crimson Alpha" -glog.txt %*
@@ -834,9 +834,26 @@ newgui bloodcolor [
newgui soundtrack [
guistayopen [
guitext (concat "Soundtrack:" $soundtrack)
looplist curst $soundtracks [
guibutton $curst (concat soundtrack $curst)
guitext (concatword "^f1" $_soundtrack_title)
guitext (concatword "^f0By " $_soundtrack_author)
guibar
guilist [
guilist [
guistrut 15 1
looplist curst $soundtracks1 [
guibutton $curst (concat soundtrack $curst)
]
]
guilist [
guistrut 15 1
looplist curst $soundtracks2 [
guibutton $curst (concat soundtrack $curst)
]
]
]
//looplist curst $soundtracks [
// guibutton $curst (concat soundtrack $curst)
//]
]
] "Soundtracks"
showsoundtracks = [
@@ -845,6 +862,13 @@ showsoundtracks = [
soundtracks = (concat $soundtracks $curst)
]
soundtracks = (sortlist $soundtracks x y [<=s $x $y])
soundtracks1 = ""
soundtracks2 = ""
looplist2 st1 st2 $soundtracks [
soundtracks1 = (concat $soundtracks1 $st1)
soundtracks2 = (concat $soundtracks2 $st2)
]
showgui soundtrack
]
@@ -1,4 +1,6 @@
// Aether Dream Window House
// By Joseph 'JS97' Smythe

_soundtrack_title "Aether Dream Window House"
_soundtrack_author "JS97 [^fs^fhtri4ge^fr]"
musicnum = 11
@@ -1,3 +1,5 @@
// Alpha 1.x Soundtrack

_soundtrack_title "Alpha 1.x Soundtrack"
_soundtrack_author "Various artists from OGA"
musicnum = 4
@@ -1,4 +1,6 @@
// Music by skrjablin
// https://opengameart.org/users/skrjablin

_soundtrack_title "Various music from skrjablin"
_soundtrack_author "skrjablin"
musicnum = 6
@@ -1,4 +1,6 @@
// Music by tricksntraps
// https://opengameart.org/users/tricksntraps

_soundtrack_title "Various music from tricksntraps"
_soundtrack_author "tricksntraps"
musicnum = 9
@@ -1,4 +1,6 @@
// Music by yd
// https://opengameart.org/users/yd

_soundtrack_title "Various music from yd"
_soundtrack_author "yd"
musicnum = 6

This file was deleted.

@@ -0,0 +1,12 @@
@ECHO OFF

set CARD_BIN=bin

IF /I "%PROCESSOR_ARCHITECTURE%" == "amd64" (
set CARD_BIN=bin64
)
IF /I "%PROCESSOR_ARCHITEW6432%" == "amd64" (
set CARD_BIN=bin64
)

start %CARD_BIN%\cardboard_mingw.exe "-q$HOME\My Games\Project Crimson Alpha" -gserver-log.txt -d %*
@@ -1,12 +1,12 @@
@ECHO OFF

set SAUER_BIN=bin
set CARD_BIN=bin

IF /I "%PROCESSOR_ARCHITECTURE%" == "amd64" (
set SAUER_BIN=bin64
set CARD_BIN=bin64
)
IF /I "%PROCESSOR_ARCHITEW6432%" == "amd64" (
set SAUER_BIN=bin64
set CARD_BIN=bin64
)

start %SAUER_BIN%\cardboard_msvc.exe "-q$HOME\My Games\Project Crimson Alpha" -gserver-log.txt -d %*
start %CARD_BIN%\cardboard_msvc.exe "-q$HOME\My Games\Project Crimson Alpha" -gserver-log.txt -d %*
@@ -130,8 +130,6 @@ CLIENT_OBJS= \
fpsgame/discord.o \
fpsgame/entities.o \
fpsgame/fps.o \
fpsgame/monster.o \
fpsgame/movable.o \
fpsgame/render.o \
fpsgame/scoreboard.o \
fpsgame/server.o \
@@ -185,7 +183,7 @@ default: all
all: client server

clean:
-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_MASTER_OBJS) sauer_client sauer_server sauer_master
-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_MASTER_OBJS) cardboard_client cardboard_server cardboard_master

$(filter-out shared/%,$(CLIENT_PCH)): $(filter shared/%,$(CLIENT_PCH))

@@ -206,25 +204,25 @@ $(SERVER_MASTER_OBJS): CXXFLAGS += $(SERVER_INCLUDES)
ifneq (,$(findstring MINGW,$(PLATFORM)))
client: $(CLIENT_OBJS)
$(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc -o vcpp/mingw.res -O coff
$(CXX) $(CXXFLAGS) -o $(WINBIN)/sauerbraten.exe vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS)
$(CXX) $(CXXFLAGS) -o $(WINBIN)/cardboard_mingw.exe vcpp/mingw.res $(CLIENT_OBJS) $(CLIENT_LIBS)

server: $(SERVER_OBJS)
$(WINDRES) -I vcpp -i vcpp/mingw.rc -J rc -o vcpp/mingw.res -O coff
$(CXX) $(CXXFLAGS) -o $(WINBIN)/sauer_server.exe vcpp/mingw.res $(SERVER_OBJS) $(SERVER_LIBS)
$(CXX) $(CXXFLAGS) -o $(WINBIN)/cardboard_mingw_server.exe vcpp/mingw.res $(SERVER_OBJS) $(SERVER_LIBS)

master: $(MASTER_OBJS)
$(CXX) $(CXXFLAGS) -o $(WINBIN)/sauer_master.exe $(MASTER_OBJS) $(MASTER_LIBS)
$(CXX) $(CXXFLAGS) -o $(WINBIN)/cardboard_mingw_master.exe $(MASTER_OBJS) $(MASTER_LIBS)

install: all
else
client: libenet $(CLIENT_OBJS)
$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
$(CXX) $(CXXFLAGS) -o cardboard_client $(CLIENT_OBJS) $(CLIENT_LIBS)

server: libenet $(SERVER_OBJS)
$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)
$(CXX) $(CXXFLAGS) -o cardboard_server $(SERVER_OBJS) $(SERVER_LIBS)

master: libenet $(MASTER_OBJS)
$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
$(CXX) $(CXXFLAGS) -o cardboard_master $(MASTER_OBJS) $(MASTER_LIBS)

shared/cube2font.o: shared/cube2font.c
$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
@@ -233,8 +231,8 @@ cube2font: shared/cube2font.o
$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz

install: all
cp sauer_client ../bin_unix/$(PLATFORM_PREFIX)_client
cp sauer_server ../bin_unix/$(PLATFORM_PREFIX)_server
cp cardboard_client ../bin_unix/$(PLATFORM_PREFIX)_client
cp cardboard_server ../bin_unix/$(PLATFORM_PREFIX)_server
ifneq (,$(STRIP))
$(STRIP) ../bin_unix/$(PLATFORM_PREFIX)_client
$(STRIP) ../bin_unix/$(PLATFORM_PREFIX)_server
@@ -327,7 +325,7 @@ engine/grass.o: engine/model.h
engine/irc.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
engine/irc.o: shared/ents.h shared/command.h shared/iengine.h shared/igame.h
engine/irc.o: engine/world.h engine/octa.h engine/lightmap.h engine/bih.h
engine/irc.o: engine/texture.h engine/model.h engine/varray.h
engine/irc.o: engine/texture.h engine/model.h
engine/lightmap.o: engine/engine.h shared/cube.h shared/tools.h shared/geom.h
engine/lightmap.o: shared/ents.h shared/command.h shared/glexts.h
engine/lightmap.o: shared/glemu.h shared/iengine.h shared/igame.h
@@ -480,14 +478,6 @@ fpsgame/entities.o: fpsgame/ai.h
fpsgame/fps.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
fpsgame/fps.o: shared/ents.h shared/command.h shared/glexts.h shared/glemu.h
fpsgame/fps.o: shared/iengine.h shared/igame.h fpsgame/ai.h
fpsgame/monster.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
fpsgame/monster.o: shared/ents.h shared/command.h shared/glexts.h
fpsgame/monster.o: shared/glemu.h shared/iengine.h shared/igame.h
fpsgame/monster.o: fpsgame/ai.h
fpsgame/movable.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
fpsgame/movable.o: shared/ents.h shared/command.h shared/glexts.h
fpsgame/movable.o: shared/glemu.h shared/iengine.h shared/igame.h
fpsgame/movable.o: fpsgame/ai.h
fpsgame/render.o: fpsgame/game.h shared/cube.h shared/tools.h shared/geom.h
fpsgame/render.o: shared/ents.h shared/command.h shared/glexts.h
fpsgame/render.o: shared/glemu.h shared/iengine.h shared/igame.h fpsgame/ai.h
@@ -763,7 +763,8 @@ void computezoom()
if (headachefov)
{
const float alt = camera1->o.dist(worldpos);
curfov = min(160.0f, atan(fov / alt) * 2 * (180.0f / PI));

curfov = min(160.0f, (float)(atan(fov / alt) * 2 * (180.0f / PI)));
return;
}
if (!zoom) { curfov = fov; curavatarfov = avatarfov; return; }
@@ -242,6 +242,8 @@ SVARFP(soundtrack, "adwh", {
execfile(soundtrackcfgname, false);
if (identexists("playsong")) execute("playsong");
});
SVARP(_soundtrack_title, "");
SVARP(_soundtrack_author, "");

static Mix_Chunk *loadwav(const char *name)
{
@@ -4,7 +4,7 @@ namespace game
{
char* gametitle = "Project Crimson";
char* gamestage = "Alpha";
char* gameversion = "2.0rc2";
char* gameversion = "2.0rc3";

ICOMMAND(version, "", (), {
defformatstring(vers, "%s %s %s", gametitle, gamestage, gameversion);

0 comments on commit b7d9e61

Please sign in to comment.
You can’t perform that action at this time.