From 37f463fdfe74340a06c8510b4dc04c46a5a1ccbf Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Tue, 27 Apr 2004 18:55:57 +0000 Subject: [PATCH] - decreased kick time even more, fixed type error SVN-Revision: 789 --- src/defines.h | 3 +-- src/text.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/defines.h b/src/defines.h index f7642d47b..c2c71a7e1 100644 --- a/src/defines.h +++ b/src/defines.h @@ -87,8 +87,7 @@ enum DyingType { /* Timing constants (in ms): */ -#define KICKING_TIME 600 - +#define KICKING_TIME 200 /* Debugging */ diff --git a/src/text.cpp b/src/text.cpp index 6560327f4..6d2e3a5d4 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -246,7 +246,7 @@ void display_text_file(const std::string& file, Surface* surface) string_list_type names; char filename[1024]; string_list_init(&names); - sprintf(filename,"%s/%s", datadir.c_str(), file); + sprintf(filename,"%s/%s", datadir.c_str(), file.c_str()); if((fi = fopen(filename,"r")) != NULL) { while(fgets(temp, sizeof(temp), fi) != NULL) -- 2.11.0