Forum de Ti-Gen.org, le site francophone des TI

diff -ur Game.orig/Constants.h Game/Constants.h
--- Game.orig/Constants.h  Wed Jul 28 00:28:54 2004
+++ Game/Constants.h  Thu Jul 29 08:21:30 2004
@@ -119,11 +119,11 @@
//^ Menu ^//
////////////////////////////////////////////////////////////

-#define MENU_ERASE_Y 4
+#define MENU_ERASE_Y 2
#define MENU_LINE_COUNT 5
#define MENU_SHIFT_LOGO 6
#define MENU_SHIFT_X 80
-#define MENU_SHIFT_Y 56
+#define MENU_SHIFT_Y 44
#define MENU_SPACE_Y 12

diff -ur Game.orig/Menu.c Game/Menu.c
--- Game.orig/Menu.c  Wed Jul 21 00:59:06 2004
+++ Game/Menu.c  Thu Jul 29 08:33:08 2004
@@ -75,51 +75,48 @@
// Menu Draw ^//
////////////////////////////////////////////////////////////

-void MenuDraw(struct WORLD *world, unsigned char (*menu)[16], unsigned short count, unsigned short choice, unsigned short draw, signed short shift)
+void MenuDraw(struct WORLD *world, unsigned char (*menu)[16], unsigned short count, unsigned short choice)
{
   unsigned short i;
-  signed short x, y = MENU_SHIFT_Y + shift;
+  signed short x, y = MENU_SHIFT_Y;

//------------------- Draw menu items --------------------//
+  PortSet(world->dark,239,127);
+  ScrRectFill(&(SCR_RECT){{MENU_SHIFT_X - 55,MENU_SHIFT_Y - MENU_ERASE_Y - 1,
+              MENU_SHIFT_X + 54,MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 4}},
+              &(SCR_RECT){{0,0,239,127}},A_REVERSE);
+  PortSet(world->light,239,127);
+  ScrRectFill(&(SCR_RECT){{MENU_SHIFT_X - 55,MENU_SHIFT_Y - MENU_ERASE_Y - 1,
+              MENU_SHIFT_X + 54,MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 4}},
+              &(SCR_RECT){{0,0,239,127}},A_REVERSE);
+  PortRestore();
+
+  FC_StrMode(FC_6x8 | FC_OR);
+
+  for (i = 0; i < 4; i++)
+  {
+    x = (FC_StrWidth1(menu[i])-6) >> 1;
+
+    FC_StrDraw(MENU_SHIFT_X - x - 1,y,menu[i],world->light);
+    FC_StrDraw(MENU_SHIFT_X - x,y,menu[i],world->dark);
+    FC_StrDraw(MENU_SHIFT_X - x,y,menu[i],world->light);

-  choice = (choice ? choice - 1 : count - 1);
-
-  if (shift > 0)
-  {
-    choice = (choice ? choice - 1 : count - 1);
-    y -= MENU_SPACE_Y;
-  }
-  else if (!shift)
-  {
-    i = (choice < count - 1 ? choice + 1 : 0);
-    x = FC_StrWidth0(menu[i]) >> 1;
-
-    FC_StrDraw0(MENU_SHIFT_X - x - 11,MENU_SHIFT_Y + MENU_SPACE_Y,"[",world->light);
-    FC_StrDraw0(MENU_SHIFT_X - x - 10,MENU_SHIFT_Y + MENU_SPACE_Y,"[",world->dark);
-    FC_StrDraw0(MENU_SHIFT_X - x - 10,MENU_SHIFT_Y + MENU_SPACE_Y,"[",world->light);
-    FC_StrDraw0(MENU_SHIFT_X + x + 9,MENU_SHIFT_Y + MENU_SPACE_Y,"]",world->light);
-    FC_StrDraw0(MENU_SHIFT_X + x + 10,MENU_SHIFT_Y + MENU_SPACE_Y,"]",world->dark);
-    FC_StrDraw0(MENU_SHIFT_X + x + 10,MENU_SHIFT_Y + MENU_SPACE_Y,"]",world->light);
-  }
-
-  for (i = 0; i < draw; i++)
-  {
-    x = FC_StrWidth0(menu[choice]) >> 1;
+    if (i == choice)
+    {
+      x = (FC_StrWidth1(menu[i])-6) >> 1;

-    FC_StrDraw0(MENU_SHIFT_X - x - 1,y,menu[choice],world->light);
-    FC_StrDraw0(MENU_SHIFT_X - x,y,menu[choice],world->dark);
-    FC_StrDraw0(MENU_SHIFT_X - x,y,menu[choice],world->light);
+      FC_StrDraw(MENU_SHIFT_X - x - 12,y,"[",world->light);
+      FC_StrDraw(MENU_SHIFT_X - x - 11,y,"[",world->dark);
+      FC_StrDraw(MENU_SHIFT_X - x - 11,y,"[",world->light);
+      FC_StrDraw(MENU_SHIFT_X + x + 8,y,"]",world->light);
+      FC_StrDraw(MENU_SHIFT_X + x + 9,y,"]",world->dark);
+      FC_StrDraw(MENU_SHIFT_X + x + 9,y,"]",world->light);
+    }

     y += MENU_SPACE_Y;
-
-    if (++choice == count)
-      choice = 0;
   }

-  memset(world->dark + (MENU_SHIFT_Y - MENU_ERASE_Y - MENU_SPACE_Y) * 30,0,MENU_SPACE_Y * 30);
-  memset(world->dark + (MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 3) * 30,0,MENU_SPACE_Y * 30);
-  memset(world->light + (MENU_SHIFT_Y - MENU_ERASE_Y - MENU_SPACE_Y) * 30,0,MENU_SPACE_Y * 30);
-  memset(world->light + (MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 3) * 30,0,MENU_SPACE_Y * 30);
+  FC_StrMode(FC_4x6 | FC_OR);

//---------------------- Draw lines ----------------------//

@@ -135,7 +132,7 @@
   for (i = MENU_LINE_COUNT; i--
   {
     FastDrawHLine_R(world->dark,line[i][0],line[i][1],MENU_SHIFT_Y - MENU_ERASE_Y - 1,A_NORMAL);
-    FastDrawHLine_R(world->dark,line[i][0],line[i][1],MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 3,A_NORMAL);
+    FastDrawHLine_R(world->dark,line[i][0],line[i][1],MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 4,A_NORMAL);
   }

//--------------------- Draw logo ---------------------//
@@ -152,7 +149,6 @@

unsigned char MenuSelect(struct WORLD *world, unsigned char (*menu)[16], unsigned short count, unsigned short choice, unsigned char esc)
{
-  signed short roll = 0;
   unsigned char exit = 255, *keyReleased = world->keyReleased;

//-------------------- Initialisation --------------------//
@@ -169,69 +165,58 @@
     FC_Keyboard();
     FC_StrMode(FC_4x6 | FC_OR);

+//--------------- Update all active items ----------------//
+
+    WorldUpdate(world);
+    MessageUpdate(world);
+
//-------------------- Test keypress ---------------------//

-    if (roll)
+    MenuDraw(world,menu,count,choice);
+
+    if (KeyReleased(up))
     {
-      MenuDraw(world,menu,count,choice,4,roll);
+      keyReleased[0] = 1;
+    }
+    else if (keyReleased[0])
+    {
+      choice = (choice ? choice - 1 : count - 1);

-      roll += (roll < 0 ? 4 : - 4);
+      keyReleased[0] = 0;
     }
-    else
+
+    if (KeyReleased(down))
     {
-      MenuDraw(world,menu,count,choice,3,0);
-
-      if (KeyReleased(up))
-      {
-        keyReleased[0] = 1;
-      }
-      else if (keyReleased[0])
-      {
-        choice = (choice ? choice - 1 : count - 1);
-        roll = - MENU_SPACE_Y;
-
-        keyReleased[0] = 0;
-      }
-
-      if (KeyReleased(down))
-      {
-        keyReleased[2] = 1;
-      }
-      else if (keyReleased[2])
-      {
-        choice = (choice < count - 1 ? choice + 1 : 0);
-        roll = MENU_SPACE_Y;
-
-        keyReleased[2] = 0;
-      }
-
-      if (KeyReleased(b1))
-      {
-        keyReleased[4] = 1;
-      }
-      else if (keyReleased[4])
-      {
-        exit = choice;
-
-        keyReleased[4] = 0;
-      }
-
-      if (KeyReleased(esc))
-      {
-        keyReleased[9] = 1;
-      }
-      else if (keyReleased[9])
-      {
-        exit = esc;
+      keyReleased[2] = 1;
+    }
+    else if (keyReleased[2])
+    {
+      choice = (choice < count - 1 ? choice + 1 : 0);

-        keyReleased[9] = 0;
-      }
+      keyReleased[2] = 0;
     }

-//--------------- Update all active items ----------------//
+    if (KeyReleased(b1))
+    {
+      keyReleased[4] = 1;
+    }
+    else if (keyReleased[4])
+    {
+      exit = choice;

-    WorldUpdate(world);
-    MessageUpdate(world);
+      keyReleased[4] = 0;
+    }
+
+    if (KeyReleased(esc))
+    {
+      keyReleased[9] = 1;
+    }
+    else if (keyReleased[9])
+    {
+      exit = esc;
+
+      keyReleased[9] = 0;
+    }

//--------------------- Draw buffers ---------------------//

diff -ur Game.orig/Prototypes.h Game/Prototypes.h
--- Game.orig/Prototypes.h  Wed Jul 28 00:19:02 2004
+++ Game/Prototypes.h  Thu Jul 29 08:22:26 2004
@@ -101,7 +101,7 @@
////////////////////////////////////////////////////////////

unsigned char Menu(struct WORLD *);
-void MenuDraw(struct WORLD *, unsigned char (*)[16], unsigned short, unsigned short, unsigned short, signed short);
+void MenuDraw(struct WORLD *, unsigned char (*)[16], unsigned short, unsigned short);
unsigned char MenuSelect(struct WORLD *, unsigned char (*)[16], unsigned short, unsigned short, unsigned char);

diff -ur Game.orig/Venus.c Game/Venus.c
--- Game.orig/Venus.c  Tue Jul 20 19:12:40 2004
+++ Game/Venus.c  Thu Jul 22 16:23:32 2004
@@ -32,7 +32,7 @@

//------- Initialisation, Grays, Interruptions... --------//

-  if ((FC_Start(FC_Redirect | FC_Gray | FC_SaveScreen | FC_4x6))
+  if ((FC_Start(FC_Redirect | FC_Gray | FC_SaveScreen | FC_4x6 | FC_6x)
    && (WorldCreate(&world)))
   {
     randomize();
diff -ur Game.orig/Venus.tpr Game/Venus.tpr
--- Game.orig/Venus.tpr  Wed Jul 28 02:54:36 2004
+++ Game/Venus.tpr  Thu Jul 29 08:33:06 2004
@@ -49,7 +49,8 @@
Enable Error Return=0
Save Screen=0
[File Editing]
-Open File=Cocuments and SettingsVertyosBureauVenusb05SrcGameVenus.c
+Open File=E:TI-89ticunoffasmgamesvenusb05SrcGameMenu.c
+
[Included Files]
C File 1=Venus.c
C File 2=Addons.c
@@ -75,3 +76,4 @@
Header File 4=Prototypes.h
Header File 5=Structures.h
Header File 6=Factory.h
+

diff -urw Game.orig/Constants.h Game/Constants.h
--- Game.orig/Constants.h  Wed Jul 28 00:28:54 2004
+++ Game/Constants.h  Thu Jul 29 08:21:30 2004
@@ -119,11 +119,11 @@
//^ Menu ^//
////////////////////////////////////////////////////////////

-#define MENU_ERASE_Y 4
+#define MENU_ERASE_Y 2
#define MENU_LINE_COUNT 5
#define MENU_SHIFT_LOGO 6
#define MENU_SHIFT_X 80
-#define MENU_SHIFT_Y 56
+#define MENU_SHIFT_Y 44
#define MENU_SPACE_Y 12

diff -urw Game.orig/Menu.c Game/Menu.c
--- Game.orig/Menu.c  Wed Jul 21 00:59:06 2004
+++ Game/Menu.c  Thu Jul 29 08:33:08 2004
@@ -75,51 +75,48 @@
// Menu Draw ^//
////////////////////////////////////////////////////////////

-void MenuDraw(struct WORLD *world, unsigned char (*menu)[16], unsigned short count, unsigned short choice, unsigned short draw, signed short shift)
+void MenuDraw(struct WORLD *world, unsigned char (*menu)[16], unsigned short count, unsigned short choice)
{
   unsigned short i;
-  signed short x, y = MENU_SHIFT_Y + shift;
+  signed short x, y = MENU_SHIFT_Y;

//------------------- Draw menu items --------------------//
-
-  choice = (choice ? choice - 1 : count - 1);
-
-  if (shift > 0)
-  {
-    choice = (choice ? choice - 1 : count - 1);
-    y -= MENU_SPACE_Y;
-  }
-  else if (!shift)
-  {
-    i = (choice < count - 1 ? choice + 1 : 0);
-    x = FC_StrWidth0(menu[i]) >> 1;
-
-    FC_StrDraw0(MENU_SHIFT_X - x - 11,MENU_SHIFT_Y + MENU_SPACE_Y,"[",world->light);
-    FC_StrDraw0(MENU_SHIFT_X - x - 10,MENU_SHIFT_Y + MENU_SPACE_Y,"[",world->dark);
-    FC_StrDraw0(MENU_SHIFT_X - x - 10,MENU_SHIFT_Y + MENU_SPACE_Y,"[",world->light);
-    FC_StrDraw0(MENU_SHIFT_X + x + 9,MENU_SHIFT_Y + MENU_SPACE_Y,"]",world->light);
-    FC_StrDraw0(MENU_SHIFT_X + x + 10,MENU_SHIFT_Y + MENU_SPACE_Y,"]",world->dark);
-    FC_StrDraw0(MENU_SHIFT_X + x + 10,MENU_SHIFT_Y + MENU_SPACE_Y,"]",world->light);
+  PortSet(world->dark,239,127);
+  ScrRectFill(&(SCR_RECT){{MENU_SHIFT_X - 55,MENU_SHIFT_Y - MENU_ERASE_Y - 1,
+              MENU_SHIFT_X + 54,MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 4}},
+              &(SCR_RECT){{0,0,239,127}},A_REVERSE);
+  PortSet(world->light,239,127);
+  ScrRectFill(&(SCR_RECT){{MENU_SHIFT_X - 55,MENU_SHIFT_Y - MENU_ERASE_Y - 1,
+              MENU_SHIFT_X + 54,MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 4}},
+              &(SCR_RECT){{0,0,239,127}},A_REVERSE);
+  PortRestore();
+
+  FC_StrMode(FC_6x8 | FC_OR);
+
+  for (i = 0; i < 4; i++)
+  {
+    x = (FC_StrWidth1(menu[i])-6) >> 1;
+
+    FC_StrDraw(MENU_SHIFT_X - x - 1,y,menu[i],world->light);
+    FC_StrDraw(MENU_SHIFT_X - x,y,menu[i],world->dark);
+    FC_StrDraw(MENU_SHIFT_X - x,y,menu[i],world->light);
+
+    if (i == choice)
+    {
+      x = (FC_StrWidth1(menu[i])-6) >> 1;
+
+      FC_StrDraw(MENU_SHIFT_X - x - 12,y,"[",world->light);
+      FC_StrDraw(MENU_SHIFT_X - x - 11,y,"[",world->dark);
+      FC_StrDraw(MENU_SHIFT_X - x - 11,y,"[",world->light);
+      FC_StrDraw(MENU_SHIFT_X + x + 8,y,"]",world->light);
+      FC_StrDraw(MENU_SHIFT_X + x + 9,y,"]",world->dark);
+      FC_StrDraw(MENU_SHIFT_X + x + 9,y,"]",world->light);
   }

-  for (i = 0; i < draw; i++)
-  {
-    x = FC_StrWidth0(menu[choice]) >> 1;
-
-    FC_StrDraw0(MENU_SHIFT_X - x - 1,y,menu[choice],world->light);
-    FC_StrDraw0(MENU_SHIFT_X - x,y,menu[choice],world->dark);
-    FC_StrDraw0(MENU_SHIFT_X - x,y,menu[choice],world->light);
-
     y += MENU_SPACE_Y;
-
-    if (++choice == count)
-      choice = 0;
   }

-  memset(world->dark + (MENU_SHIFT_Y - MENU_ERASE_Y - MENU_SPACE_Y) * 30,0,MENU_SPACE_Y * 30);
-  memset(world->dark + (MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 3) * 30,0,MENU_SPACE_Y * 30);
-  memset(world->light + (MENU_SHIFT_Y - MENU_ERASE_Y - MENU_SPACE_Y) * 30,0,MENU_SPACE_Y * 30);
-  memset(world->light + (MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 3) * 30,0,MENU_SPACE_Y * 30);
+  FC_StrMode(FC_4x6 | FC_OR);

//---------------------- Draw lines ----------------------//

@@ -135,7 +132,7 @@
   for (i = MENU_LINE_COUNT; i--
   {
     FastDrawHLine_R(world->dark,line[i][0],line[i][1],MENU_SHIFT_Y - MENU_ERASE_Y - 1,A_NORMAL);
-    FastDrawHLine_R(world->dark,line[i][0],line[i][1],MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 3,A_NORMAL);
+    FastDrawHLine_R(world->dark,line[i][0],line[i][1],MENU_SHIFT_Y - MENU_ERASE_Y + MENU_SPACE_Y * 4,A_NORMAL);
   }

//--------------------- Draw logo ---------------------//
@@ -152,7 +149,6 @@

unsigned char MenuSelect(struct WORLD *world, unsigned char (*menu)[16], unsigned short count, unsigned short choice, unsigned char esc)
{
-  signed short roll = 0;
   unsigned char exit = 255, *keyReleased = world->keyReleased;

//-------------------- Initialisation --------------------//
@@ -169,17 +165,14 @@
     FC_Keyboard();
     FC_StrMode(FC_4x6 | FC_OR);

-//-------------------- Test keypress ---------------------//
+//--------------- Update all active items ----------------//

-    if (roll)
-    {
-      MenuDraw(world,menu,count,choice,4,roll);
+    WorldUpdate(world);
+    MessageUpdate(world);

-      roll += (roll < 0 ? 4 : - 4);
-    }
-    else
-    {
-      MenuDraw(world,menu,count,choice,3,0);
+//-------------------- Test keypress ---------------------//
+
+    MenuDraw(world,menu,count,choice);

       if (KeyReleased(up))
       {
@@ -188,7 +181,6 @@
       else if (keyReleased[0])
       {
         choice = (choice ? choice - 1 : count - 1);
-        roll = - MENU_SPACE_Y;

         keyReleased[0] = 0;
       }
@@ -200,7 +192,6 @@
       else if (keyReleased[2])
       {
         choice = (choice < count - 1 ? choice + 1 : 0);
-        roll = MENU_SPACE_Y;

         keyReleased[2] = 0;
       }
@@ -226,12 +217,6 @@

         keyReleased[9] = 0;
       }
-    }
-
-//--------------- Update all active items ----------------//
-
-    WorldUpdate(world);
-    MessageUpdate(world);

//--------------------- Draw buffers ---------------------//

diff -urw Game.orig/Prototypes.h Game/Prototypes.h
--- Game.orig/Prototypes.h  Wed Jul 28 00:19:02 2004
+++ Game/Prototypes.h  Thu Jul 29 08:22:26 2004
@@ -101,7 +101,7 @@
////////////////////////////////////////////////////////////

unsigned char Menu(struct WORLD *);
-void MenuDraw(struct WORLD *, unsigned char (*)[16], unsigned short, unsigned short, unsigned short, signed short);
+void MenuDraw(struct WORLD *, unsigned char (*)[16], unsigned short, unsigned short);
unsigned char MenuSelect(struct WORLD *, unsigned char (*)[16], unsigned short, unsigned short, unsigned char);

diff -urw Game.orig/Venus.c Game/Venus.c
--- Game.orig/Venus.c  Tue Jul 20 19:12:40 2004
+++ Game/Venus.c  Thu Jul 22 16:23:32 2004
@@ -32,7 +32,7 @@

//------- Initialisation, Grays, Interruptions... --------//

-  if ((FC_Start(FC_Redirect | FC_Gray | FC_SaveScreen | FC_4x6))
+  if ((FC_Start(FC_Redirect | FC_Gray | FC_SaveScreen | FC_4x6 | FC_6x)
    && (WorldCreate(&world)))
   {
     randomize();
diff -urw Game.orig/Venus.tpr Game/Venus.tpr
--- Game.orig/Venus.tpr  Wed Jul 28 02:54:36 2004
+++ Game/Venus.tpr  Thu Jul 29 08:33:06 2004
@@ -49,7 +49,8 @@
Enable Error Return=0
Save Screen=0
[File Editing]
-Open File=C:\Documents and Settings\Vertyos\Bureau\Venusb05\Src\Game\Venus.c
+Open File=E:\TI-89\ticunoff\asm\games\venusb05\Src\Game\Menu.c
+
[Included Files]
C File 1=Venus.c
C File 2=Addons.c
@@ -75,3 +76,4 @@
Header File 4=Prototypes.h
Header File 5=Structures.h
Header File 6=Factory.h
+

Bienvenue Invité ! Se connecter Mes sujets	Administrer
Utilisateurs actifs : Aucun membre + 1 visiteur