From fef6cefe0584538ab99e5980d8f3dbea4b19dcf5 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 10 Dec 2013 03:56:18 +0000
Subject: [PATCH] [Fix] A few minor fixes.
---
bin/Makefile | 20 ++++++++++----------
dat/fleet.xml | 4 ++--
scripts/ai/empire.lua | 3 ++-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/bin/Makefile b/bin/Makefile
index 762b283..1c1b399 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,6 +1,6 @@
# OPTIONS.
-DEBUG = 1
-#DEBUG_PARANOID = 1
+DEBUG := 1
+#DEBUG_PARANOID := 1
OS := LINUX
#OS := WIN32
@@ -8,11 +8,11 @@ OS := LINUX
#CC = clang
# VERSION.
-VMAJOR = 0
-VMINOR = 0
-VREV = 1
-VERSION = -DVMAJOR=$(VMAJOR) -DVMINOR=$(VMINOR) -DVREV=$(VREV)
-VERSIONFILE = VERSION
+VMAJOR := 0
+VMINOR := 0
+VREV := 1
+VERSION := -DVMAJOR=$(VMAJOR) -DVMINOR=$(VMINOR) -DVREV=$(VREV)
+VERSIONFILE := VERSION
# OBJECTS.
APPNAME = Lephisto
@@ -38,7 +38,7 @@ LDFLAGS = -lm $(LDLUA) $(LDSDL) $(LDXML) $(LDTTF) $(LDGL) $(LDPNG)
# OS Stuff.
ifeq ($(OS),LINUX)
- CFLAGS += -D_POSIX_SOURCE
+CFLAGS += -D_POSIX_SOURCE
endif
# Debug stuff.
@@ -48,12 +48,12 @@ CFLAGS += -W -Wall -Wextra -Wunused -Wshadow -Wpointer-arith -Wmissing-prototype
-fstack-protector-all -g3 -DDEBUG -DLUA_USE_APICHECK -std=c99
ifdef DEBUG_PARANOID
- CFLAGS += -DDEBUG_PARANOID
+CFLAGS += -DDEBUG_PARANOID
endif
# Handle OS Debug stuff here.
ifeq ($(OS), LINUX)
- LDFLAGS += -rdynamic
+LDFLAGS += -rdynamic
endif # Linux.
else # DEBUG
diff --git a/dat/fleet.xml b/dat/fleet.xml
index ef35075..f820959 100644
--- a/dat/fleet.xml
+++ b/dat/fleet.xml
@@ -43,7 +43,7 @@
<faction>DLF</faction>
<pilots>
<pilot chance="100">Vendetta</pilot>
- </pilot>
+ </pilots>
</fleet>
<fleet name="DLF Sml Force">
<ai>dlf</ai>
@@ -53,7 +53,7 @@
<pilot chance="80">Hyena</pilot>
<pilot chance="60">Admonisher</pilot>
<pilot chance="80">Vandetta</pilot>
- </pilot>
+ </pilots>
</fleet>
<fleet name="DLF Med Force">
<ai>dlf</ai>
diff --git a/scripts/ai/empire.lua b/scripts/ai/empire.lua
index 9b43c36..ecbf107 100644
--- a/scripts/ai/empire.lua
+++ b/scripts/ai/empire.lua
@@ -26,8 +26,9 @@ function taunt(target, offence)
"Your head will make a fine gift for the Emperor!"
} else
taunts = {
- "You dare attack me!"
+ "You dare attack me!",
"You are no match for the Empire!",
+ "The Empire will have your head!",
"You'll regret this!"
}
end