Skip to content

Commit af2c072

Browse files
committed
name change
1 parent 98b1ce4 commit af2c072

20 files changed

+82
-86
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
appdata/
3535
build.log
36-
yelindor
36+
gorget
3737
data/gfx/
3838
data/sounds/
3939
src/.o/

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a techno magic roguelike with a surface world. Work in progress.
1+
Work in progress.

RUNME

+16-20
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,21 @@
2222

2323
cat <<%%
2424
${RED}
25-
,, ,...
26-
\`7MM"""Mq. \`7MM .g8""8q. .d' ""
27-
MM \`MM. MM .dP' \`YM. dM\`
28-
MM ,M9 .gP"Ya ,6"Yb. MM \`7MMpMMMb.pMMMb. ,pP"Ybd dM' \`MM mMMmm
29-
MMmmdM9 ,M' Yb 8) MM MM MM MM MM 8I \`" MM MM MM
30-
MM YM. 8M"""""" ,pm9MM MM MM MM MM \`YMMMa. MM. ,MP MM
31-
MM \`Mb.YM. , 8M MM MM MM MM MM L. I8 \`Mb. ,dP' MM
32-
.JMML. .JMM.\`Mbmmd' \`Moo9^Yo..JMML..JMML JMML JMML.M9mmmP' \`"bmmd"' .JMML.
33-
34-
35-
36-
,, ,, ,,
37-
\`YMM' \`MM' \`7MM db \`7MM
38-
VMA ,V MM MM
39-
VMA ,V .gP"Ya MM \`7MM \`7MMpMMMb. ,M""bMM ,pW"Wq.\`7Mb,od8
40-
VMMP ,M' Yb MM MM MM MM ,AP MM 6W' \`Wb MM' "'
41-
MM 8M"""""" MM MM MM MM 8MI MM 8M M8 MM
42-
MM YM. , MM MM MM MM \`Mb MM YA. ,A9 MM
43-
.JMML. \`Mbmmd'.JMML..JMML..JMML JMML.\`Wbmd"MML.\`Ybmd9'.JMML.
25+
26+
@@@@@@@@ @@@@@@ @@@@@@@ @@@@@@@@ @@@@@@@@ @@@@@@@
27+
@@@@@@@@@ @@@@@@@@ @@@@@@@@ @@@@@@@@@ @@@@@@@@ @@@@@@@
28+
!@@ @@! @@@ @@! @@@ !@@ @@! @@!
29+
!@! !@! @!@ !@! @!@ !@! !@! !@!
30+
!@! @!@!@ @!@ !@! @!@!!@! !@! @!@!@ @!!!:! @!!
31+
!!! !!@!! !@! !!! !!@!@! !!! !!@!! !!!!!: !!!
32+
:!! !!: !!: !!! !!: :!! :!! !!: !!: !!:
33+
:!: !:: :!: !:! :!: !:! :!: !:: :!: :!:
34+
::: :::: ::::: :: :: ::: ::: :::: :: :::: ::
35+
:: :: : : : : : : : :: :: : : :: :: :
36+
: : . :: : : : :
37+
. : : . . .
38+
: .
39+
.
4440
4541
${RESET}
4642
%%
@@ -198,7 +194,7 @@ if [ $? -ne 0 ]; then
198194
tech_support >> $LOG
199195
log_err "Build failed."
200196
log_err "Could you send $LOG to $MAINTAINER?"
201-
log_err "Or file an issue at https://github.com/goblinhack/yelindor"
197+
log_err "Or file an issue at https://github.com/goblinhack/gorget"
202198
exit 1
203199
else
204200
#

build/RUNME.docker.debian

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cd ..
44
cd build/docker
55
DOCKER_FILE=debian.dockerfile
6-
DOCKER_IMAGE=yelindor.debian
6+
DOCKER_IMAGE=gorget.debian
77

88
which docker &>/dev/null
99
if [[ $? -ne 0 ]]; then

build/RUNME.docker.fedora

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cd ..
44
cd build/docker
55
DOCKER_FILE=fedora.dockerfile
6-
DOCKER_IMAGE=yelindor.fedora
6+
DOCKER_IMAGE=gorget.fedora
77

88
which docker &>/dev/null
99
if [[ $? -ne 0 ]]; then

build/RUNME.docker.ubuntu

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cd ..
44
cd build/docker
55
DOCKER_FILE=ubuntu.dockerfile
6-
DOCKER_IMAGE=yelindor.ubuntu
6+
DOCKER_IMAGE=gorget.ubuntu
77

88
which docker &>/dev/null
99
if [[ $? -ne 0 ]]; then

build/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
. ./build/common.sh
2121

22-
TARGET=yelindor
22+
TARGET=gorget
2323

2424
# The default MINGW32 and MINGW64 environments build binaries using the older
2525
# MSVCRT library that should be present on all Windows systems.
@@ -265,7 +265,7 @@ fi
265265
LDLIBS="$SDL_LIBS"
266266
LDLIBS="$LDLIBS -lSDL2_mixer"
267267

268-
/bin/rm -f data/yelindor-hiscore.txt data/yelindor-config.txt
268+
/bin/rm -f data/gorget-hiscore.txt data/gorget-config.txt
269269

270270
#
271271
# Common config file

build/common.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,23 @@ log() {
7171
}
7272

7373
log_info() {
74-
echo "yelindor: ${GREEN}$*${RESET}"
74+
echo "gorget: ${GREEN}$*${RESET}"
7575
}
7676

7777
log_echo() {
78-
echo "yelindor: $*"
78+
echo "gorget: $*"
7979
}
8080

8181
log_err() {
82-
echo "yelindor: ${RED}ERROR: $*${RESET}"
82+
echo "gorget: ${RED}ERROR: $*${RESET}"
8383
}
8484

8585
log_warn() {
86-
echo "yelindor: ${CYAN}WARN: $*${RESET}"
86+
echo "gorget: ${CYAN}WARN: $*${RESET}"
8787
}
8888

8989
log_die() {
90-
echo "yelindor: ${RED}FATAL ERROR: $*${RESET}"
90+
echo "gorget: ${RED}FATAL ERROR: $*${RESET}"
9191
echo "Mail goblinhack@gmail.com for help"
9292
exit 1
9393
}

build/docker/debian.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ RUN mkdir -p $HOME/.ssh/ &&
4949
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts && \
5050
eval `ssh-agent -s` && \
5151
printf "${SSH_KEY_PASSPHRASE}\n" | ssh-add $HOME/.ssh/id_rsa && \
52-
git clone git@github.com:goblinhack/yelindor.git && \
52+
git clone git@github.com:goblinhack/gorget.git && \
5353
rm -rf $HOME/.ssh/
5454

55-
RUN cd yelindor && sh ./RUNME && ./yelindor
55+
RUN cd gorget && sh ./RUNME && ./gorget
5656
RUN bash

build/docker/fedora.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ RUN mkdir -p $HOME/.ssh/ &&
4848
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts && \
4949
eval `ssh-agent -s` && \
5050
printf "${SSH_KEY_PASSPHRASE}\n" | ssh-add $HOME/.ssh/id_rsa && \
51-
git clone git@github.com:goblinhack/yelindor.git && \
51+
git clone git@github.com:goblinhack/gorget.git && \
5252
rm -rf $HOME/.ssh/
5353

54-
RUN cd yelindor && sh ./RUNME && ./yelindor
54+
RUN cd gorget && sh ./RUNME && ./gorget
5555
RUN bash

build/docker/ubuntu.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ RUN mkdir -p $HOME/.ssh/ &&
5151
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts && \
5252
eval `ssh-agent -s` && \
5353
printf "${SSH_KEY_PASSPHRASE}\n" | ssh-add $HOME/.ssh/id_rsa && \
54-
git clone git@github.com:goblinhack/yelindor.git && \
54+
git clone git@github.com:goblinhack/gorget.git && \
5555
rm -rf $HOME/.ssh/
5656

57-
RUN cd yelindor && sh ./RUNME && ./yelindor
57+
RUN cd gorget && sh ./RUNME && ./gorget
5858
RUN bash

build/ramdisk.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
root = pathlib.Path(".")
1818

1919
if sys.platform == 'win32':
20-
target="yelindor.exe"
20+
target="gorget.exe"
2121
else:
22-
target="yelindor"
22+
target="gorget"
2323

2424
#
2525
# If the make target exists, see if any graphics are newer than the

build/windows/license.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<organization>Neil McGill - Open Source License</organization>
88
<patchVersion>0</patchVersion>
99
<product>BitRock InstallBuilder Multiplatform Enterprise</product>
10-
<project>Yelindor</project>
10+
<project>Gorget</project>
1111
<signature>f70a9f81d7bba6749d6b590150b0a1d2</signature>
1212
</license>

build/windows/windows.xml

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<project>
2-
<shortName>Yelindor</shortName>
3-
<fullName>Yelindor</fullName>
2+
<shortName>Gorget</shortName>
3+
<fullName>Gorget</fullName>
44
<version>0.2.4</version>
55
<installerFilename></installerFilename>
6-
<licenseFile>C:/msys64/home/neila/yelindor/src/LICENSE</licenseFile>
7-
<logoImage>C:/msys64/home/neila/yelindor/build/windows/yelindor-logo.png</logoImage>
6+
<licenseFile>C:/msys64/home/neila/gorget/src/LICENSE</licenseFile>
7+
<logoImage>C:/msys64/home/neila/gorget/build/windows/gorget-logo.png</logoImage>
88
<componentList>
99
<component>
1010
<name>default</name>
@@ -14,53 +14,53 @@
1414
<show>1</show>
1515
<desktopShortcutList>
1616
<shortcut>
17-
<comment>yelindor</comment>
18-
<exec>${installdir}/yelindor/yelindor</exec>
19-
<icon>${installdir}/yelindor/yelindor.ico</icon>
20-
<name>yelindor</name>
17+
<comment>gorget</comment>
18+
<exec>${installdir}/gorget/gorget</exec>
19+
<icon>${installdir}/gorget/gorget.ico</icon>
20+
<name>gorget</name>
2121
<noPinToStart>0</noPinToStart>
22-
<path>${installdir}/yelindor</path>
22+
<path>${installdir}/gorget</path>
2323
<platforms>windows-x64</platforms>
2424
<runAsAdmin>0</runAsAdmin>
2525
<runInTerminal>0</runInTerminal>
26-
<windowsExec>${installdir}/yelindor/yelindor.exe</windowsExec>
26+
<windowsExec>${installdir}/gorget/gorget.exe</windowsExec>
2727
<windowsExecArgs></windowsExecArgs>
28-
<windowsIcon>${installdir}/yelindor/yelindor.ico</windowsIcon>
29-
<windowsPath>${installdir}/yelindor/</windowsPath>
28+
<windowsIcon>${installdir}/gorget/gorget.ico</windowsIcon>
29+
<windowsPath>${installdir}/gorget/</windowsPath>
3030
</shortcut>
3131
</desktopShortcutList>
3232
<folderList>
3333
<folder>
3434
<description>Program Files</description>
35-
<destination>${installdir}/yelindor/</destination>
35+
<destination>${installdir}/gorget/</destination>
3636
<name>programfiles</name>
3737
<platforms>windows-x64</platforms>
3838
<shortcutList>
3939
<shortcut>
4040
<comment>Uninstall</comment>
41-
<exec>${installdir}/yelindor/${uninstallerName}</exec>
41+
<exec>${installdir}/gorget/${uninstallerName}</exec>
4242
<icon></icon>
4343
<name>Uninstall ${product_fullname}</name>
44-
<path>${installdir}/yelindor/</path>
44+
<path>${installdir}/gorget/</path>
4545
<platforms>windows-x64</platforms>
4646
<runAsAdmin>0</runAsAdmin>
4747
<runInTerminal>0</runInTerminal>
48-
<windowsExec>${installdir}/yelindor/${uninstallerName}.exe</windowsExec>
48+
<windowsExec>${installdir}/gorget/${uninstallerName}.exe</windowsExec>
4949
<windowsExecArgs></windowsExecArgs>
5050
<windowsIcon></windowsIcon>
51-
<windowsPath>${installdir}/yelindor/</windowsPath>
51+
<windowsPath>${installdir}/gorget/</windowsPath>
5252
</shortcut>
5353
</shortcutList>
5454
</folder>
5555
<folder>
5656
<description>Program Files</description>
57-
<destination>${installdir}/yelindor/</destination>
57+
<destination>${installdir}/gorget/</destination>
5858
<name>programfileslinux</name>
5959
<platforms>linux</platforms>
6060
</folder>
6161
<folder>
6262
<description>Program Files</description>
63-
<destination>${installdir}/yelindor/</destination>
63+
<destination>${installdir}/gorget/</destination>
6464
<name>programfileswindows</name>
6565
<platforms>windows-x64</platforms>
6666
<distributionFileList>
@@ -149,16 +149,16 @@
149149
<origin>C:/msys64/ucrt64/bin/zlib1.dll</origin>
150150
</distributionFile>
151151
<distributionFile>
152-
<origin>C:/msys64/home/neila/yelindor/yelindor.exe</origin>
152+
<origin>C:/msys64/home/neila/gorget/gorget.exe</origin>
153153
</distributionFile>
154154
<distributionFile>
155-
<origin>C:/msys64/home/neila/yelindor/yelindor.pdb</origin>
155+
<origin>C:/msys64/home/neila/gorget/gorget.pdb</origin>
156156
</distributionFile>
157157
<distributionFile>
158-
<origin>C:/msys64/home/neila/yelindor/data</origin>
158+
<origin>C:/msys64/home/neila/gorget/data</origin>
159159
</distributionFile>
160160
<distributionFile>
161-
<origin>C:/msys64/home/neila/yelindor/build/windows/yelindor.ico</origin>
161+
<origin>C:/msys64/home/neila/gorget/build/windows/gorget.ico</origin>
162162
</distributionFile>
163163
<distributionFile>
164164
<origin>C:/msys64/ucrt64/bin/libunwind.dll</origin>
@@ -181,9 +181,9 @@
181181
</distributionFileList>
182182
</folder>
183183
<folder>
184-
<description>yelindor</description>
185-
<destination>${installdir}/yelindor/</destination>
186-
<name>yelindor</name>
184+
<description>gorget</description>
185+
<destination>${installdir}/gorget/</destination>
186+
<name>gorget</name>
187187
<platforms>all</platforms>
188188
</folder>
189189
</folderList>
@@ -193,27 +193,27 @@
193193
<name>Uninstall ${product_fullname}</name>
194194
<runAsAdmin>0</runAsAdmin>
195195
<runInTerminal>0</runInTerminal>
196-
<windowsExec>${installdir}/yelindor/${uninstallerName}.exe</windowsExec>
196+
<windowsExec>${installdir}/gorget/${uninstallerName}.exe</windowsExec>
197197
<windowsExecArgs></windowsExecArgs>
198198
<windowsIcon></windowsIcon>
199-
<windowsPath>${installdir}/yelindor/</windowsPath>
199+
<windowsPath>${installdir}/gorget/</windowsPath>
200200
</startMenuShortcut>
201201
<startMenuShortcut>
202-
<comment>Yelindor</comment>
203-
<name>yelindor</name>
202+
<comment>Gorget</comment>
203+
<name>gorget</name>
204204
<runAsAdmin>0</runAsAdmin>
205205
<runInTerminal>0</runInTerminal>
206-
<windowsExec>${installdir}/yelindor/yelindor.exe</windowsExec>
206+
<windowsExec>${installdir}/gorget/gorget.exe</windowsExec>
207207
<windowsExecArgs></windowsExecArgs>
208-
<windowsIcon>${installdir}/yelindor/yelindor.ico</windowsIcon>
209-
<windowsPath>${installdir}/yelindor</windowsPath>
208+
<windowsIcon>${installdir}/gorget/gorget.ico</windowsIcon>
209+
<windowsPath>${installdir}/gorget</windowsPath>
210210
</startMenuShortcut>
211211
</startMenuShortcutList>
212212
</component>
213213
</componentList>
214214
<preInstallationActionList>
215215
<deleteFile>
216-
<path>${installdir}/yelindor/</path>
216+
<path>${installdir}/gorget/</path>
217217
</deleteFile>
218218
</preInstallationActionList>
219219
<enableRollback>1</enableRollback>

src/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include ../build/Makefile.template
22
# CFLAGS+=-O0
33

4-
NAME=yelindor
4+
NAME=gorget
55
BUILD_DIR=../.o
66

77
TARGET_GAME=../$(NAME)$(EXE)

src/game.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Game::Game(std::string appdata)
1212

1313
this->appdata = appdata;
1414

15-
saved_dir = appdata + DIR_SEP + "yelindor" + DIR_SEP;
15+
saved_dir = appdata + DIR_SEP + "gorget" + DIR_SEP;
1616
save_slot = 1;
1717

1818
save_meta = "seed " + seed_name + ", ";

src/gl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ void gl_ext_init(void)
12151215
}
12161216

12171217
LOG("OpenGl: - CreateWindowEx");
1218-
hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, g_szClassName, "yelindor startup", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT,
1218+
hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, g_szClassName, "gorget startup", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT,
12191219
CW_USEDEFAULT, 240, 120, nullptr, nullptr, hInstance, nullptr);
12201220

12211221
if (hwnd == nullptr) {

src/log.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ static void sdl_msgerr_(const char *fmt, va_list args)
461461

462462
#if SDL_MAJOR_VERSION >= 2
463463
CON("INF: Show SDL message box");
464-
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "yelindor", buf, nullptr);
464+
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "gorget", buf, nullptr);
465465
CON("INF: Finished SDL message box");
466466
#endif
467467
}

0 commit comments

Comments
 (0)