Mercurial > hg > Members > koba > t_dandy

changeset 65:b97628fca317

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
int -> long. not move on ABIBIT=64.
author tkaito
date Thu, 17 Feb 2011 04:49:47 +0900
parents 07bc996c8e49
children f27a6af6514c
files Character.c Character.h ppe/Atari.cc ppe/asteroid.cc ppe/chara_state10.cc ppe/chara_state11.cc ppe/chara_state12.cc ppe/chara_state13.cc ppe/chara_state22.cc ppe/chara_state25.cc ppe/chara_state28.cc ppe/chara_state31.cc ppe/chara_state32.cc ppe/chara_state33.cc ppe/chara_state34.cc ppe/chara_state35.cc ppe/chara_state40.cc ppe/chara_state41.cc ppe/chara_state500.cc ppe/chara_state601.cc ppe/chara_state602.cc sys.c
diffstat 22 files changed, 60 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/Character.c	Fri Feb 11 18:20:30 2011 +0900
+++ b/Character.c	Thu Feb 17 04:49:47 2011 +0900
@@ -34,15 +34,6 @@
 BOOL tf = FALSE;
 static int pool_size;
 
-int init_chara_list(int num)
-{
-  if(active_chara_list == NULL)
-    {
-      return extend_chara_list_pool(num);
-    }
-  return 1;
-}
-
 int
 extend_chara_list_pool(int num)
 {
@@ -102,6 +93,15 @@
   tf = FALSE;
 }
 
+int init_chara_list(int num)
+{
+  if(active_chara_list == NULL)
+    {
+      return extend_chara_list_pool(num);
+    }
+  return 1;
+}
+
 
 void
 Putenemy(int charano, float x, float y, float vx, float vy,
--- a/Character.h	Fri Feb 11 18:20:30 2011 +0900
+++ b/Character.h	Thu Feb 17 04:49:47 2011 +0900
@@ -71,10 +71,10 @@
 //extern teki enemy[300];
 extern const table enemystate[50];
 
-int init_chara_list(int num);
 int extend_chara_list_pool(int num);
 void TFon();
 void TFoff();
+int init_chara_list(int num);
 void Putenemy(int charano, float x, float y, float vx, float vy,
 	      CHARACTER * (*action)(CHARACTER *chara));
 CHARACTER * delete_chara(CHARACTER *p);
--- a/ppe/Atari.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/Atari.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -7,8 +7,8 @@
 static int
 atari(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int w = (int)smanager->get_param(0);
-    int h = (int)smanager->get_param(1);
+    long w = (long)smanager->get_param(0);
+    long h = (long)smanager->get_param(1);
     long load_id = (long)smanager->get_param(2);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/asteroid.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/asteroid.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,7 +6,7 @@
 static int
 asteroid_task(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int asteroidi = (int)smanager->get_param(0);
+    long asteroidi = (long)smanager->get_param(0);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     
--- a/ppe/chara_state10.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state10.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state10(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rinkx = (int)smanager->get_param(0);
-    int rinky = (int)smanager->get_param(1);
+    long rinkx = (long)smanager->get_param(0);
+    long rinky = (long)smanager->get_param(1);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     CHARACTER *q = (CHARACTER*)smanager->get_output(wbuf, 0);
--- a/ppe/chara_state11.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state11.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state11(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rinkf1 = (int)smanager->get_param(0);
-    int count = (int)smanager->get_param(1);
+    long rinkf1 = (long)smanager->get_param(0);
+    long count = (long)smanager->get_param(1);
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
 
--- a/ppe/chara_state12.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state12.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,14 +6,14 @@
 static int
 state12(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int fastebos = (int)smanager->get_param(0);
-    int count = (int)smanager->get_param(1);
-    int rinkx = (int)smanager->get_param(2);
-    int rinky = (int)smanager->get_param(3);
+    long fastebos = (long)smanager->get_param(0);
+    long count    = (long)smanager->get_param(1);
+    long rinkx    = (long)smanager->get_param(2);
+    long rinky    = (long)smanager->get_param(3);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     int length;
-    int rinkf2;
+    int rinkf2 = 0;
     int index_count = 0;
 
     if (fastebos > 60*60) {
--- a/ppe/chara_state13.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state13.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,11 +6,11 @@
 static int
 state13(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rinkx = (int)smanager->get_param(0);
-    int rinky = (int)smanager->get_param(1);
-    int filpcount = (int)smanager->get_param(2);
-    int flag = (int)smanager->get_param(3);
-    int count = (int)smanager->get_param(4);
+    long rinkx = (long)smanager->get_param(0);
+    long rinky = (long)smanager->get_param(1);
+    long filpcount = (long)smanager->get_param(2);
+    long flag = (long)smanager->get_param(3);
+    long count = (long)smanager->get_param(4);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state22.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state22.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,10 +6,10 @@
 static int
 state22(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand1 = (int)smanager->get_param(0);
-    int rand2 = (int)smanager->get_param(1);
-    int rand3 = (int)smanager->get_param(2);
-    int rand4 = (int)smanager->get_param(3);
+    long rand1 = (long)smanager->get_param(0);
+    long rand2 = (long)smanager->get_param(1);
+    long rand3 = (long)smanager->get_param(2);
+    long rand4 = (long)smanager->get_param(3);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
 
--- a/ppe/chara_state25.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state25.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -10,9 +10,9 @@
     int length = 1;
     int amari;
 
-    int part1_f = (int)smanager->get_param(0);
-    int part5_f = (int)smanager->get_param(1);
-    int rand = (int)smanager->get_param(2);
+    long part1_f = (long)smanager->get_param(0);
+    long part5_f = (long)smanager->get_param(1);
+    long rand    = (long)smanager->get_param(2);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     int count = *(int*)smanager->get_input(rbuf, 1);
--- a/ppe/chara_state28.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state28.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -7,7 +7,7 @@
 static int
 state28(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand = (int)smanager->get_param(0);
+    long rand = (long)smanager->get_param(0);
 
     int length = 2;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state31.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state31.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,7 +6,7 @@
 static int
 state31(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int part3_f = (int)smanager->get_param(2);
+    long part3_f = (long)smanager->get_param(2);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state32.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state32.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,9 +6,9 @@
 static int
 state32(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int part4_f = (int)smanager->get_param(3);
-    int enemystate_14 = (int)smanager->get_param(4);
-    int enemystate_20 = (int)smanager->get_param(5);
+    long part4_f = (long)smanager->get_param(3);
+    long enemystate_14 = (long)smanager->get_param(4);
+    long enemystate_20 = (long)smanager->get_param(5);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state33.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state33.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state33(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemystate_11 = (int)smanager->get_param(4);
-    int enemystate_19 = (int)smanager->get_param(5);
+    long enemystate_11 = (long)smanager->get_param(4);
+    long enemystate_19 = (long)smanager->get_param(5);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state34.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state34.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state34(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemystate_12 = (int)smanager->get_param(4);
-    int enemystate_21 = (int)smanager->get_param(5);
+    long enemystate_12 = (long)smanager->get_param(4);
+    long enemystate_21 = (long)smanager->get_param(5);
 
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state35.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state35.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state35(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemystate_15 = (int)smanager->get_param(4);
-    int enemystate_16 = (int)smanager->get_param(5);
+    long enemystate_15 = (long)smanager->get_param(4);
+    long enemystate_16 = (long)smanager->get_param(5);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state40.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state40.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,7 +6,7 @@
 static int
 state40(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemy_part1_f = (int)smanager->get_param(0);
+    long enemy_part1_f = (long)smanager->get_param(0);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state41.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state41.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state41(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int enemy_part2_f = (int)smanager->get_param(1);
-    int rand = (int)smanager->get_param(6);
+    long enemy_part2_f = (long)smanager->get_param(1);
+    long rand = (long)smanager->get_param(6);
     
     int length;
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
--- a/ppe/chara_state500.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state500.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -7,7 +7,7 @@
 static int
 state500(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand = (int)smanager->get_param(0);
+    long rand = (long)smanager->get_param(0);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     int count = *(int*)smanager->get_input(rbuf, 1);
--- a/ppe/chara_state601.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state601.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,8 +6,8 @@
 static int
 state601(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand1 = (int)smanager->get_param(0);
-    int rand2 = (int)smanager->get_param(1);
+    long rand1 = (long)smanager->get_param(0);
+    long rand2 = (long)smanager->get_param(1);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
     player *jiki = (player*)smanager->get_input(rbuf, 1);
--- a/ppe/chara_state602.cc	Fri Feb 11 18:20:30 2011 +0900
+++ b/ppe/chara_state602.cc	Thu Feb 17 04:49:47 2011 +0900
@@ -6,10 +6,10 @@
 static int
 state602(SchedTask *smanager, void *rbuf, void *wbuf)
 {
-    int rand1 = (int)smanager->get_param(0);
-    int rand2 = (int)smanager->get_param(1);
-    int rand3 = (int)smanager->get_param(2);
-    int rand4 = (int)smanager->get_param(3);
+    long rand1 = (long)smanager->get_param(0);
+    long rand2 = (long)smanager->get_param(1);
+    long rand3 = (long)smanager->get_param(2);
+    long rand4 = (long)smanager->get_param(3);
 
     CHARACTER *p = (CHARACTER*)smanager->get_input(rbuf, 0);
 
--- a/sys.c	Fri Feb 11 18:20:30 2011 +0900
+++ b/sys.c	Thu Feb 17 04:49:47 2011 +0900
@@ -10,7 +10,7 @@
 int malloc_align16(void *free, void *aligned, int size)
 {
   char *index;
-  unsigned int *f=(unsigned int *)free,*a=(unsigned int *)aligned;
+  unsigned long *f=(unsigned long *)free,*a=(unsigned long *)aligned;
 
   if (free == NULL || aligned == NULL || size <= 0) return(-1);
 
@@ -20,11 +20,11 @@
       return(-1);
     }
 
-  *f = *a = (unsigned int)index;
-  if (((unsigned int)index % ALIGN_16BYTE) != 0)
+  *f = *a = (unsigned long)index;
+  if (((unsigned long)index % ALIGN_16BYTE) != 0)
     {
-      index += ALIGN_16BYTE - ((unsigned int)index % ALIGN_16BYTE);
-      *a = (unsigned int)index;
+      index += ALIGN_16BYTE - ((unsigned long)index % ALIGN_16BYTE);
+      *a = (unsigned long)index;
     }
   return(0);
 }