Merge branch 'incoming'

1 files changed, 3 insertions, 5 deletions

diff --git a/tests/hello_world_sdl.cpp b/tests/hello_world_sdl.cpp
index b6401995..eeaad0cd 100644
--- a/tests/hello_world_sdl.cpp
+++ b/tests/hello_world_sdl.cpp
@@ -2,7 +2,7 @@
 #include <SDL/SDL.h>
 
 
-int main() {
+extern "C" int main(int argc, char** argv) {
   printf("hello, world!\n");
 
   SDL_Init(SDL_INIT_VIDEO);
@@ -11,10 +11,8 @@ int main() {
   if (SDL_MUSTLOCK(screen)) SDL_LockSurface(screen);
   for (int i = 0; i < 256; i++) {
     for (int j = 0; j < 256; j++) {
-      *((char*)screen->pixels + i*256*4 + j*4 + 0) = i;
-      *((char*)screen->pixels + i*256*4 + j*4 + 1) = j;
-      *((char*)screen->pixels + i*256*4 + j*4 + 2) = 255-i;
-      *((char*)screen->pixels + i*256*4 + j*4 + 3) = (i+j)%255; // actually ignored, since this is to the screen
+      // alpha component is actually ignored, since this is to the screen
+      *((Uint32*)screen->pixels + i * 256 + j) = SDL_MapRGBA(screen->format, i, j, 255-i, (i+j) % 255);
     }
   }
   if (SDL_MUSTLOCK(screen)) SDL_UnlockSurface(screen);