Merged the specifics of Caanoo 1.2 port by Pheel + Enabled TTF text on Caanoo

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1645 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2010-11-05 01:03:11 +00:00
parent a59de659bd
commit 7a3ae5824a
12 changed files with 29 additions and 19 deletions

View File

@@ -1698,7 +1698,7 @@ void Set_all_video_modes(void)
// The first mode will have index number 0.
// It will be the default mode if an unsupported one
// is requested in gfx2.ini
#if defined(__GP2X__)
#if defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__)
// Native GP2X resolution
Set_video_mode( 320,240,0, 1);
#else
@@ -1708,7 +1708,7 @@ void Set_all_video_modes(void)
Set_video_mode( 320,200,0, 1);
Set_video_mode( 320,224,0, 1);
#if !defined(__GP2X__)
#if !defined(__GP2X__) && !defined(__WIZ__) && !defined(__CAANOO__)
// For the GP2X, this one is already declared above.
Set_video_mode( 320,240,0, 1);
#endif
@@ -1777,7 +1777,7 @@ void Set_all_video_modes(void)
for (index=0; Modes[index]; index++)
{
int index2;
#if defined(__GP2X__)
#if defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__)
// On the GP2X the first mode is not windowed, so include it in the search.
index2=0;
#else
@@ -1925,7 +1925,7 @@ int Load_CFG(int reload_all)
!Read_word_le(Handle, &cfg_video_mode.Height) )
goto Erreur_lecture_config;
#if defined(__GP2X__)
#if defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__)
index2=0;
#else
index2=1;
@@ -2254,7 +2254,7 @@ int Save_CFG(void)
// D'abord compter les modes pour lesquels l'utilisateur a mis une préférence
modes_to_save=0;
#if defined(__GP2X__)
#if defined(__GP2X__) || defined (__WIZ__) || defined (__CAANOO__)
index = 0;
#else
index = 1;
@@ -2270,7 +2270,7 @@ int Save_CFG(void)
if (!Write_byte(Handle, Chunk.Number) ||
!Write_word_le(Handle, Chunk.Size) )
goto Erreur_sauvegarde_config;
#if defined(__GP2X__)
#if defined(__GP2X__) || defined (__WIZ__) || defined (__CAANOO__)
index = 0;
#else
index = 1;