Mercurial > otakunoraifu
comparison scn2k/scn2k_impl.cc @ 57:6d9146f56ccf
* Move some opcodes
* Merge last changes from xclannad
author | Thibaut GIRKA <thib@sitedethib.com> |
---|---|
date | Sat, 14 Nov 2009 23:31:51 +0100 |
parents | ddbcbd000206 |
children | bdd8a5ff8f46 |
comparison
equal
deleted
inserted
replaced
56:c7bcc0ec2267 | 57:6d9146f56ccf |
---|---|
390 } | 390 } |
391 | 391 |
392 void Scn2k::ShowCursor(void) { | 392 void Scn2k::ShowCursor(void) { |
393 HideCursor(); | 393 HideCursor(); |
394 char key[1024]; | 394 char key[1024]; |
395 sprintf(key, "#MOUSE_CURSOR.%03d.NAME",mouse_type); | 395 sprintf(key, "#MOUSE_CURSOR.%03d.NAME", mouse_type); |
396 const char* name = config->GetParaStr(key); | 396 const char* name = config->GetParaStr(key); |
397 if (name == NULL || name[0] == 0) mouse_surface = DEFAULT_MOUSECURSOR; | 397 if (name == NULL || name[0] == 0) mouse_surface = DEFAULT_MOUSECURSOR; |
398 else { | 398 else |
399 mouse_surface = parent.Root().NewSurface(name, COLOR_MASK); | 399 mouse_surface = parent.Root().NewSurface("toto", COLOR_MASK); |
400 } | 400 if (mouse_surface == NULL) |
401 if (mouse_surface == NULL) mouse_surface = DEFAULT_MOUSECURSOR; | 401 mouse_surface = DEFAULT_MOUSECURSOR; |
402 System::Main::SetCursor(mouse_surface, Rect(8, 8, 8+32, 8+32)); | 402 System::Main::SetCursor(mouse_surface, Rect(8, 8, 8+32, 8+32)); |
403 } | 403 } |
404 | 404 |
405 void Scn2k::HideCursor(void) { | 405 void Scn2k::HideCursor(void) { |
406 if (mouse_surface) { | 406 if (mouse_surface) { |