- decreased kick time even more, fixed type error

SVN-Revision: 789

diff --git a/src/defines.h b/src/defines.h
index f7642d4..c2c71a7 100644 (file)
--- 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 6560327..6d2e3a5 100644 (file)
--- 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)