[Fix] A few minor fixes.

This commit is contained in:
Allanis 2013-12-10 03:56:18 +00:00
parent b7ddccd309
commit fef6cefe05
3 changed files with 14 additions and 13 deletions

View File

@ -1,6 +1,6 @@
# OPTIONS. # OPTIONS.
DEBUG = 1 DEBUG := 1
#DEBUG_PARANOID = 1 #DEBUG_PARANOID := 1
OS := LINUX OS := LINUX
#OS := WIN32 #OS := WIN32
@ -8,11 +8,11 @@ OS := LINUX
#CC = clang #CC = clang
# VERSION. # VERSION.
VMAJOR = 0 VMAJOR := 0
VMINOR = 0 VMINOR := 0
VREV = 1 VREV := 1
VERSION = -DVMAJOR=$(VMAJOR) -DVMINOR=$(VMINOR) -DVREV=$(VREV) VERSION := -DVMAJOR=$(VMAJOR) -DVMINOR=$(VMINOR) -DVREV=$(VREV)
VERSIONFILE = VERSION VERSIONFILE := VERSION
# OBJECTS. # OBJECTS.
APPNAME = Lephisto APPNAME = Lephisto
@ -38,7 +38,7 @@ LDFLAGS = -lm $(LDLUA) $(LDSDL) $(LDXML) $(LDTTF) $(LDGL) $(LDPNG)
# OS Stuff. # OS Stuff.
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
CFLAGS += -D_POSIX_SOURCE CFLAGS += -D_POSIX_SOURCE
endif endif
# Debug stuff. # 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 -fstack-protector-all -g3 -DDEBUG -DLUA_USE_APICHECK -std=c99
ifdef DEBUG_PARANOID ifdef DEBUG_PARANOID
CFLAGS += -DDEBUG_PARANOID CFLAGS += -DDEBUG_PARANOID
endif endif
# Handle OS Debug stuff here. # Handle OS Debug stuff here.
ifeq ($(OS), LINUX) ifeq ($(OS), LINUX)
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
endif # Linux. endif # Linux.
else # DEBUG else # DEBUG

View File

@ -43,7 +43,7 @@
<faction>DLF</faction> <faction>DLF</faction>
<pilots> <pilots>
<pilot chance="100">Vendetta</pilot> <pilot chance="100">Vendetta</pilot>
</pilot> </pilots>
</fleet> </fleet>
<fleet name="DLF Sml Force"> <fleet name="DLF Sml Force">
<ai>dlf</ai> <ai>dlf</ai>
@ -53,7 +53,7 @@
<pilot chance="80">Hyena</pilot> <pilot chance="80">Hyena</pilot>
<pilot chance="60">Admonisher</pilot> <pilot chance="60">Admonisher</pilot>
<pilot chance="80">Vandetta</pilot> <pilot chance="80">Vandetta</pilot>
</pilot> </pilots>
</fleet> </fleet>
<fleet name="DLF Med Force"> <fleet name="DLF Med Force">
<ai>dlf</ai> <ai>dlf</ai>

View File

@ -26,8 +26,9 @@ function taunt(target, offence)
"Your head will make a fine gift for the Emperor!" "Your head will make a fine gift for the Emperor!"
} else } else
taunts = { taunts = {
"You dare attack me!" "You dare attack me!",
"You are no match for the Empire!", "You are no match for the Empire!",
"The Empire will have your head!",
"You'll regret this!" "You'll regret this!"
} }
end end