aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Guryanov <caiiiycuk@gmail.com>2013-10-30 18:18:29 +0700
committerAleksander Guryanov <caiiiycuk@gmail.com>2013-10-30 18:18:29 +0700
commit2247ff845fa862a35fc9d1acf8150eb7e56f41ac (patch)
tree3f6d7354662d007fd822c5fdd9e638b7d6a7ab62
parentc45cd7c72a019f54b0f6ee873641200ecb043a25 (diff)
Fix SDL_SetColors && SDL_envets
-rw-r--r--src/library_sdl.js8
-rw-r--r--system/include/SDL/SDL_events.h1
-rw-r--r--tests/sdl_canvas_palette.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index e652dfc8..024f0c35 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -1231,11 +1231,11 @@ var LibrarySDL = {
surfData.colors = new Uint8Array(256 * 3); //256 RGB colors
}
- for (var i = firstColor; i < firstColor + nColors; i++) {
- var index = i *3;
+ for (var i = 0; i < nColors; ++i) {
+ var index = (firstColor + i) * 3;
surfData.colors[index] = {{{ makeGetValue('colors', 'i*4', 'i8', null, true) }}};
- surfData.colors[index +1] = {{{ makeGetValue('colors', 'i*4 +1', 'i8', null, true) }}};
- surfData.colors[index +2] = {{{ makeGetValue('colors', 'i*4 +2', 'i8', null, true) }}};
+ surfData.colors[index + 1] = {{{ makeGetValue('colors', 'i*4 + 1', 'i8', null, true) }}};
+ surfData.colors[index + 2] = {{{ makeGetValue('colors', 'i*4 + 2', 'i8', null, true) }}};
}
return 1;
diff --git a/system/include/SDL/SDL_events.h b/system/include/SDL/SDL_events.h
index 804ac57e..8be00ceb 100644
--- a/system/include/SDL/SDL_events.h
+++ b/system/include/SDL/SDL_events.h
@@ -55,6 +55,7 @@ extern "C" {
*/
typedef enum
{
+ SDL_NOEVENT = 0,
SDL_FIRSTEVENT = 0, /**< Unused (do not remove) */
/* Application events */
diff --git a/tests/sdl_canvas_palette.c b/tests/sdl_canvas_palette.c
index 316aa44a..361f71a6 100644
--- a/tests/sdl_canvas_palette.c
+++ b/tests/sdl_canvas_palette.c
@@ -42,7 +42,7 @@ int main() {
//changing green color
//to yellow
pal[1].r = 255;
- SDL_SetColors(screen, pal, 1, 1);
+ SDL_SetColors(screen, &pal[1], 1, 1);
{
SDL_Rect rect = { 300, 200, 300, 200 };