Merge branch 'master' of github:jpfau/legesmotus

endrift · Apr 18, 2011 · e678f78 · e678f78
2 parents 3a5400a + 17c9209
commit e678f78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/common/file.cpp b/common/file.cpp
@@ -116,7 +116,7 @@ const char* LM::user_dir() {
 	if (SUCCEEDED(err)) {
 		dir = path;
 		dir += "\\Leges Motus\\";
-		if (!CreateDirectory(cfg.c_str(), NULL)) {
+		if (!CreateDirectory(dir.c_str(), NULL)) {
 			if (GetLastError() != ERROR_ALREADY_EXISTS) {
 				WARN("Couldn't create config directory");
 			}

diff --git a/data/shaders/gl/blur.frag b/data/shaders/gl/blur.frag
@@ -3,8 +3,8 @@ uniform float d;
 uniform int ksize;
 
 void main() {
-	vec4 csum;
+	vec4 csum = vec4(0.0, 0.0, 0.0, 0.0);
-	float sum;
+	float sum = 0.0;
 	vec2 t = gl_TexCoord[0].st;
 	for (int i = 0; i < ksize; ++i) {
 		for (int j = 0; j < ksize; ++j) {
@@ -17,4 +17,4 @@ void main() {
 	}
 	csum /= sum;
 	gl_FragColor = gl_Color*vec4(csum.r/csum.a, csum.g/csum.a, csum.b/csum.a, csum.a);
-}
+}