diff options
| author | Kyle K <kylek389@gmail.com> | 2011-08-09 20:02:12 -0500 |
|---|---|---|
| committer | Kamil Kaminski <kamilkss@gmail.com> | 2011-08-09 20:02:12 -0500 |
| commit | 49291811330624761600b91ad8d01abd4e9d4b96 (patch) | |
| tree | 6fb17998008173185aa96aa9d7735fc30f578915 | |
| parent | 7a100cc78096429a623179276d3d052eefc302fa (diff) | |
| download | GLPyramid-49291811330624761600b91ad8d01abd4e9d4b96.tar.gz GLPyramid-49291811330624761600b91ad8d01abd4e9d4b96.tar.bz2 GLPyramid-49291811330624761600b91ad8d01abd4e9d4b96.zip | |
sdl: mistook logical OR with conditional
| -rw-r--r-- | sdl/platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sdl/platform.c b/sdl/platform.c index c4e11ca..7ed4f99 100644 --- a/sdl/platform.c +++ b/sdl/platform.c @@ -104,10 +104,10 @@ int load_config(struct platform *p) if (!p) return -1; - if (luaLoadConfig(p->L, "config.lua") || - luaFillTablePlatform(p->L, &p->config_table) != -1) + if ((luaLoadConfig(p->L, "config.lua") | + luaFillTablePlatform(p->L, &p->config_table)) != -1) { - /* print was was loaded from config.lua to stdout */ + /* print what was loaded from config.lua to stdout */ luaPrintTablePlatform(&p->config_table); /* override any globals that config.lua redefines */ |