From 5109958e292f5ce3f8a36aa22d8ce28bafb9fa27 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Thu, 1 Aug 2013 16:26:17 +0100
Subject: [PATCH] [Fix] More mission string formatting weirdness.
---
dat/missions/emp_collective01.lua | 2 +-
src/misn_lua.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dat/missions/emp_collective01.lua b/dat/missions/emp_collective01.lua
index b1493ab..9740d9b 100644
--- a/dat/missions/emp_collective01.lua
+++ b/dat/missions/emp_collective01.lua
@@ -21,7 +21,7 @@ end
function create()
-- Intro text.
- if tk.yesno(title[1], string.format(text[1], player.name())) then
+ if tk.yesno(title[1], text[1], player.name()) then
misn.accept()
misn_stage = 0
diff --git a/src/misn_lua.c b/src/misn_lua.c
index 6457d1d..5d3c2f6 100644
--- a/src/misn_lua.c
+++ b/src/misn_lua.c
@@ -221,7 +221,7 @@ int misn_run(Mission* misn, char* func) {
if((ret = lua_pcall(misn->L, 0, 0, 0))) {
/* Did an oops. */
err = (lua_isstring(misn->L, -1)) ? (char*) lua_tostring(misn->L, -1) : NULL;
- if(strcmp(err, "Mission Done"))
+ if(strcmp(err, "Mission Done")!=0)
WARN("Mission '%s' -> '%s' : %s",
cur_mission->data->name, func, (err) ? err : "Unknown Error");
else ret = 1;