X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfc.c;h=c0bdebece7b641564bf495745c4814732ed36e75;hb=08ea0cc335f4f9b852adedd3fe4a3fb7a0223024;hp=25e047dd06ab623477265329d3502fb3d6d5edf3;hpb=c7b2e91106fdcf40f65b8a45e0e746ad7f5ca131;p=swftools.git

diff --git a/src/swfc.c b/src/swfc.c
index 25e047d..c0bdebe 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -13,14 +13,12 @@
 #include <string.h>
 #include <memory.h>
 #include <errno.h>
-#define logf logarithmf // logf is also used by ../lib/log.h
 #include <math.h>
-#undef logf
 #include "../config.h"
 #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"
 
@@ -441,7 +439,7 @@ static void s_endSWF()
 	swf->movieSize.ymax += 20;
     }
 
-    fi = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+    fi = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
     if(fi<0) {
 	syntaxerror("couldn't create output file %s", filename);
     }
@@ -619,7 +617,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));
@@ -712,7 +710,7 @@ void s_playsound(char*name, int loops, int nomultiple, int stop)
     memset(&info, 0, sizeof(info));
     info.stop = stop;
     info.loops = loops;
-    info.multiple = !nomultiple;
+    info.nomultiple = nomultiple;
     swf_SetSoundInfo(tag, &info);
 }
 
@@ -1051,11 +1049,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 +1077,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;
 }
@@ -1308,6 +1313,10 @@ SPOINT getPoint(SRECT r, char*name)
     l--;
     return *(SPOINT*)&mpoints.buffer[l];
 }
+static int c_gradient(map_t*args) 
+{
+    return 0;
+}
 static int c_point(map_t*args) 
 {
     char*name = lu(args, "name");
@@ -1332,8 +1341,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;
 }
 
@@ -1719,6 +1733,11 @@ static struct {
  {"font", c_font, "name filename"},
  {"soundtrack", c_soundtrack, "filename"},
 
+    // generators of primitives
+
+ {"point", c_point, "name x=0 y=0"},
+ {"gradient", c_gradient, "name"},
+
     // character generators
  {"box", c_primitive, "name width height color=white line=1 @fill=none"},
  {"circle", c_primitive, "name r color=white line=1 @fill=none"},
@@ -1745,7 +1764,6 @@ static struct {
     // virtual object placement
  {"buttonput", c_buttonput, "<i> x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex=100% scaley=100% shear=0 rotate=0 above= below="},
  {"texture", c_texture, "<i> x=0 y=0 scale= scalex=100% scaley=100% shear=0 rotate=0"},
- {"point", c_point, "name x=0 y=0"},
 
     // commands which start a block
 //startclip (see above)
@@ -1839,7 +1857,7 @@ static map_t parseArguments(char*command, char*pattern)
     len = pos;
 
 /*    for(t=0;t<len;t++) {
-	printf("(%d) %s=%s %s\n", t, strndup(name[t], namelen[t]), strndup(value[t], valuelen[t]),
+	printf("(%d) %s=%s %s\n", t, strdup_n(name[t], namelen[t]), strdup_n(value[t], valuelen[t]),
 		isboolean[t]?"(boolean)":"");
     }*/
 
@@ -1860,8 +1878,8 @@ static map_t parseArguments(char*command, char*pattern)
 		value[pos].str = text;
 		value[pos].len = strlen(text);
 		/*printf("setting boolean parameter %s (to %s)\n",
-			strndup(name[pos], namelen[pos]),
-			strndup(value[pos], valuelen[pos]));*/
+			strdup_n(name[pos], namelen[pos]),
+			strdup_n(value[pos], valuelen[pos]));*/
 		break;
 	    }
 	}
@@ -1873,7 +1891,7 @@ static map_t parseArguments(char*command, char*pattern)
 	    if((type == ASSIGNMENT && !strncmp(name[pos].str, text, name[pos].len>textlen?name[pos].len:textlen)) ||
 	       (type != ASSIGNMENT && !set[pos])) {
 		if(set[pos]) {
-		    syntaxerror("value %s set twice (old value:%s)", text, strndup(value[pos].str, value[pos].len));
+		    syntaxerror("value %s set twice (old value:%s)", text, strdup_n(value[pos].str, value[pos].len));
 		}
 		if(type == ASSIGNMENT)
 		    readToken();
@@ -1882,8 +1900,8 @@ static map_t parseArguments(char*command, char*pattern)
 		value[pos].len = strlen(text);
 #if 0//def DEBUG
 		printf("setting parameter %s (to %s)\n",
-			strndup(name[pos].str, name[pos].len),
-			strndup(value[pos].str, value[pos].len));
+			strdup_n(name[pos].str, name[pos].len),
+			strdup_n(value[pos].str, value[pos].len));
 #endif
 		break;
 	    }
@@ -1894,7 +1912,7 @@ static map_t parseArguments(char*command, char*pattern)
     }
 #if 0//def DEBUG
     for(t=0;t<len;t++) {
-	printf("%s=%s\n", strndup(name[t].str, name[t].len), strndup(value[t].str, value[t].len));
+	printf("%s=%s\n", strdup_n(name[t].str, name[t].len), strdup_n(value[t].str, value[t].len));
     }
 #endif
     for(t=0;t<len;t++) {
@@ -1909,7 +1927,7 @@ static map_t parseArguments(char*command, char*pattern)
 	}
 	if(value[t].str == 0) {
 	    pushBack();
-	    syntaxerror("value for parameter %s missing (no default)", strndup(name[t].str, name[t].len));
+	    syntaxerror("value for parameter %s missing (no default)", strdup_n(name[t].str, name[t].len));
 	}
     }