Changeset 629Tweet

Timestamp:

May 10, 2011, 2:36:33 PM (9 years ago)

Author:

Sam Hocevar

Message:

ps3: disable unsupported features so that the PS3 port builds at last.

Location:

abuse/trunk/src

Files:

• innet.cpp (modified) (19 diffs)
• netcfg.cpp (modified) (4 diffs)

abuse/trunk/src/innet.cpp

@@ -58 +58 @@
 int net_init(int argc, char **argv)
 {
+#if defined __CELLOS_LV2__
+    return 0;
+#else
     int i,x,db_level=0;
     base=&local_base;
@@ -178 +181 @@
 
     return 1;
+#endif
 }
 
@@ -190 +194 @@
 int kill_net()
 {
+#if defined __CELLOS_LV2__
+  return 0;
+#else
   if (game_face) delete game_face;  game_face=NULL;
   if (join_array) free(join_array);  join_array=NULL;
@@ -203 +210 @@
     return 1;
   } else return 0;
+#endif
 }
 
@@ -213 +221 @@
 int NF_set_file_server(net_address *addr)
 {
+#if defined __CELLOS_LV2__
+  return 0;
+#else
   if (prot)
   {
@@ -226 +237 @@
     return cmd;
   } else return 0;
+#endif
 }
 
 int NF_set_file_server(char const *name)
 {
+#if !defined __CELLOS_LV2__
   if (prot)
   {
@@ -239 +252 @@
       return ret;
     } else return 0;
-  } else return 0;
+  }
+#endif
+  return 0;
 }
 
@@ -245 +260 @@
 int NF_open_file(char const *filename, char const *mode)
 {
-  if (prot)
-    return fman->rf_open_file(filename,mode);
-  else return -2;
+#if !defined __CELLOS_LV2__
+    if (prot)
+        return fman->rf_open_file(filename,mode);
+#endif
+    return -2;
 }
 
@@ -253 +270 @@
 long NF_close(int fd)
 {
+#if !defined __CELLOS_LV2__
   if (prot)
     return fman->rf_close(fd);
-  else return 0;
+#endif
+  return 0;
 }
 
 long NF_read(int fd, void *buf, long size)
 {
+#if !defined __CELLOS_LV2__
   if (prot)
     return fman->rf_read(fd,buf,size);
-  else return 0;
+#endif
+  return 0;
 }
 
 long NF_filelength(int fd)
 {
+#if !defined __CELLOS_LV2__
   if (prot)
     return fman->rf_file_size(fd);
-  else return 0;
+#endif
+  return 0;
 }
 
 long NF_seek(int fd, long offset)
 {
+#if !defined __CELLOS_LV2__
   if (prot)
     return fman->rf_seek(fd,offset);
-  else return 0;
+#endif
+  return 0;
 }
 
 long NF_tell(int fd)
 {
+#if !defined __CELLOS_LV2__
   if (prot)
     return fman->rf_tell(fd);
-  else return 0;
+#endif
+  return 0;
 }
 
@@ -289 +316 @@
 void service_net_request()
 {
+#if !defined __CELLOS_LV2__
   if (prot)
   {
@@ -351 +379 @@
     }
   }
+#endif
 }
 
@@ -356 +385 @@
 int get_remote_lsf(net_address *addr, char *filename)  // filename should be 256 bytes
 {
+#if !defined __CELLOS_LV2__
   if (prot)
   {
@@ -375 +405 @@
     return 1;
 
-  } else return 0;
+  }
+#endif
+  return 0;
 }
 
@@ -382 +414 @@
 int request_server_entry()
 {
+#if !defined __CELLOS_LV2__
   if (prot && main_net_cfg)
   {
@@ -453 +486 @@
     local_client_number=cnum;
     return cnum;
-  } else return 0;
+  }
+#endif
+  return 0;
 }
 
 int reload_start()
 {
+#if !defined __CELLOS_LV2__
   if (prot)
     return game_face->start_reload();
-  else return 0;
+#endif
+  return 0;
 }
 
 int reload_end()
 {
+#if !defined __CELLOS_LV2__
   if (prot)
     return game_face->end_reload();
-  else return 0;
+#endif
+  return 0;
 }
 
@@ -473 +512 @@
 void net_reload()
 {
+#if !defined __CELLOS_LV2__
   if (prot)
   {
@@ -592 +632 @@
     }
   }
+#endif
 }
 
@@ -704 +745 @@
 int become_server(char *name)
 {
+#if !defined __CELLOS_LV2__
   if (prot && main_net_cfg)
   {
@@ -723 +765 @@
     return 1;
   }
+#endif
   return 0;
 }

abuse/trunk/src/netcfg.cpp

@@ -35 +35 @@
 #if !defined __CELLOS_LV2__
 extern net_protocol *prot;
+#endif
 
 net_configuration::net_configuration()
 {
+#if !defined __CELLOS_LV2__
   strcpy(name,get_login());
 
@@ -49 +51 @@
   server_port=20202;
   state=SINGLE_PLAYER;
+#endif
 }
 
@@ -451 +454 @@
 {
   int ret=0;
+#if !defined __CELLOS_LV2__
   screen->clear();
 
@@ -595 +599 @@
     }
   }
+#endif
 
   return ret;
 }
 
-#endif // __CELLOS_LV2__
-