From 2233635cdc1557eb8ba9bfb37749c8ecab8df5ce Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 2 Apr 2013 22:11:34 +0100
Subject: [PATCH] [Fix] At least mission computer doesn't crash now, right?
---
src/land.c | 15 ---------------
src/misn_lua.c | 2 +-
src/toolkit.c | 2 +-
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/land.c b/src/land.c
index fd71162..ff3a7dd 100644
--- a/src/land.c
+++ b/src/land.c
@@ -796,21 +796,6 @@ static void misn(void) {
300, MISSION_HEIGHT - BUTTON_WIDTH - 120, 0,
"txtDesc", &gl_smallFont, &cBlack, NULL);
- // List.
- if(mission_ncomputer != 0) {
- // There are missions.
- misn_names = malloc(sizeof(char*)*mission_ncomputer);
- for(i = 0; i < mission_ncomputer; i++)
- misn_names[i] = strdup(mission_computer[i].title);
- } else {
- // No missions.
- misn_names = malloc(sizeof(char*));
- misn_names[0] = strdup("No Missions");
- }
-
- window_addList(secondary_wid, 20, -40,
- 300, MISSION_HEIGHT-60,
- "lstMission", misn_names, mission_ncomputer, 0, misn_update);
misn_genList(1);
}
diff --git a/src/misn_lua.c b/src/misn_lua.c
index 949bca0..3ff195c 100644
--- a/src/misn_lua.c
+++ b/src/misn_lua.c
@@ -136,7 +136,7 @@ static int misn_factions(lua_State* L) {
static int space_getPlanet(lua_State* L) {
(void)L;
// TODO: Proper getPlanet implementation.
- lua_pushstring(L, "Arrakis");
+ lua_pushstring(L, "SaraCraft");
return 1;
}
diff --git a/src/toolkit.c b/src/toolkit.c
index 0a26f45..c8fd24d 100644
--- a/src/toolkit.c
+++ b/src/toolkit.c
@@ -370,7 +370,7 @@ void window_modifyText(const unsigned int wid, char* name, char* newstring) {
Widget* wgt = window_getwgt(wid, name);
if(wgt->dat.txt.text) free(wgt->dat.txt.text);
- wgt->dat.txt.text = strdup(newstring);
+ //wgt->dat.txt.text = strdup(newstring);
}
void window_modifyImage(const unsigned int wid, char* name, glTexture* image) {