X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfc.c;h=bdb631ab3b6fe3b260ea02d275cf82c841212161;hb=40741ca413f28404d7a3e1c09563caf4f2e59f03;hp=f4d07ae6ab02c94d5c544ab04baa1fabfb99d694;hpb=18d6d6b2fd963ccd10792ecd25a7ce9f372fd865;p=swftools.git

diff --git a/src/swfc.c b/src/swfc.c
index f4d07ae..bdb631a 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -20,7 +20,7 @@
 #include "../lib/rfxswf.h"
 #include "../lib/log.h"
 #include "../lib/args.h"
-#include "q.h"
+#include "../lib/q.h"
 #include "parser.h"
 #include "wav.h"
 
@@ -619,7 +619,7 @@ void s_font(char*name, char*filename)
     int f;
     SWF swf;
     SWFFONT* font;
-    f = open(filename,O_RDONLY);
+    f = open(filename,O_RDONLY|O_BINARY);
     if (f<0) { 
 	warning("Couldn't open file \"%s\": %s", filename, strerror(errno));
 	font = (SWFFONT*)malloc(sizeof(SWFFONT));
@@ -1051,11 +1051,18 @@ int parseInt(char*str)
 }
 int parseTwip(char*str)
 {
-    char*dot = strchr(str, '.');
+    char*dot;
+    int sign=1;
+    if(str[0]=='+' || str[0]=='-') {
+	if(str[0]=='-')
+	    sign = -1;
+	str++;
+    }
+    dot = strchr(str, '.');
     if(!dot) {
 	int l=strlen(str);
 	int t;
-	return parseInt(str)*20;
+	return sign*parseInt(str)*20;
     } else {
 	int l=strlen(++dot);
 	char*s;
@@ -1072,11 +1079,11 @@ int parseTwip(char*str)
 	    l=2;
 	}
 	if(l==0)
-	    return atoi(str)*20;
+	    return sign*atoi(str)*20;
 	if(l==1)
-	    return atoi(str)*20+atoi(dot)*2;
+	    return sign*atoi(str)*20+atoi(dot)*2;
 	if(l==2)
-	    return atoi(str)*20+atoi(dot)/5;
+	    return sign*atoi(str)*20+atoi(dot)/5;
     }
     return 0;
 }
@@ -1332,8 +1339,13 @@ static int c_play(map_t*args)
     char*name = lu(args, "sound");
     char*loop = lu(args, "loop");
     char*nomultiple = lu(args, "nomultiple");
+    int nm = 0;
+    if(!strcmp(nomultiple, "nomultiple"))
+	nm = 1;
+    else
+	nm = parseInt(nomultiple);
 
-    s_playsound(name, parseInt(loop), parseInt(nomultiple), 0);
+    s_playsound(name, parseInt(loop), nm, 0);
     return 0;
 }