Changeset 61Tweet

Timestamp:

Mar 2, 2008, 5:07:11 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Get rid of game registration handling. All versions of Abuse are now registered, I guess.

Location:

abuse/trunk/src

Files:

• clisp.cpp (modified) (2 diffs)
• cop.cpp (modified) (3 diffs)
• dev.cpp (modified) (2 diffs)
• game.cpp (modified) (5 diffs)
• innet.cpp (modified) (3 diffs)
• menu.cpp (modified) (2 diffs)
• net/gclient.cpp (modified) (1 diff)
• net/gserver.cpp (modified) (2 diffs)
• net/netdrv.cpp (modified) (1 diff)
• unixnfc.cpp (modified) (2 diffs)

abuse/trunk/src/clisp.cpp

@@ -76 +76 @@
 extern void ascatter_line(int x1, int y1, int x2, int y2, int c1, int c2, int s);
 extern void show_end();
-
-extern int registered;
 
 static view *lget_view(void *arg, char const *msg)
@@ -524 +522 @@
   add_lisp_function("player_rocket_ufun",2,2,   34);
 
-  if (registered)
-  {
-    add_lisp_function("plaser_ufun",2,2,          33);
-    add_lisp_function("lsaber_ufun",2,2,          35);
-  }
-
+  add_lisp_function("plaser_ufun",2,2,          33);
+  add_lisp_function("lsaber_ufun",2,2,          35);
 
   add_lisp_function("cop_mover",3,3,            36);

abuse/trunk/src/cop.cpp

@@ -30 +30 @@
 #define DFRIS    6
 #define LSABER   7
-
-extern int registered;
 
 signed char small_fire_off[24*2]=  // x & y offset from character to end of gun.
@@ -452 +450 @@
     case FLY_POWER :
     {
-      if (registered)
-      {
-        game_object *cloud=create(S_CLOUD,o->x+o->direction*-10,o->y+jrand()%5);
-        if (current_level)
+      game_object *cloud=create(S_CLOUD,o->x+o->direction*-10,o->y+jrand()%5);
+      if (current_level)
         current_level->add_object(cloud);
-        o->set_state(run_jump);
-        o->set_gravity(1);
-        o->set_yacel(0);
-        if (o->yvel()>0) o->set_yvel(o->yvel()/2);
-        if (ym<0) 
+      o->set_state(run_jump);
+      o->set_gravity(1);
+      o->set_yacel(0);
+      if (o->yvel()>0) o->set_yvel(o->yvel()/2);
+      if (ym<0) 
         o->set_yvel(o->yvel()-3);
-        else
+      else
         o->set_yvel(o->yvel()-2);
-        the_game->play_sound(S_FLY_SND,32,o->x,o->y);
-      }
+      the_game->play_sound(S_FLY_SND,32,o->x,o->y);
     } break;
     case FAST_POWER :
@@ -489 +484 @@
     case SNEAKY_POWER :
     {
-      if (registered)
-      {
-        if (o->lvars[used_special_power]<15)
-          o->lvars[used_special_power]++;
-      }
+      if (o->lvars[used_special_power]<15)
+        o->lvars[used_special_power]++;
     } break;
   }

abuse/trunk/src/dev.cpp

@@ -34 +34 @@
 
 #define make_above_tile(x) ((x)|0x4000)
-extern int registered;
 char backw_on=0,forew_on=0,show_menu_on=0,ledit_on=0,pmenu_on=0,omenu_on=0,commandw_on=0,tbw_on=0,
      searchw_on=0,small_render_on=0,interpolate_draw=0,disable_autolight=0,fps_on=0,profile_on=0,
@@ -855 +854 @@
     if (!strcmp(argv[i],"-edit"))
     {
-      if (!registered)
-        printf("%s\n",symbol_str("no_edit"));
-      else
+      dev|=EDIT_MODE;    
+      start_edit=1;
+      start_running=1;
+      disable_autolight=1;
+      if (get_option("-2"))
       {
-                                dev|=EDIT_MODE;    
-                                start_edit=1;
-                                start_running=1;
-                                disable_autolight=1;
-                                if (get_option("-2"))
-                                {
-                                  printf("%s\n",symbol_str("no2"));
-                                  exit(0);
-                                }
+        printf("%s\n",symbol_str("no2"));
+        exit(0);
       }
     }

abuse/trunk/src/game.cpp

@@ -81 +81 @@
 char req_name[100];
 
-int registered=0;
 extern uint8_t chatting_enabled;
 
@@ -2462 +2461 @@
 extern int jmalloc_min_low_size;
 
-extern int (*verify_file_fun)(char *,char *);
-
-int registered_ok(char *filename, char *mode)
-{
-  if (registered) return 1;
-
-  char name[256],*c;
-  c=name;
-  while (*filename) { *c=*(filename++); *c=toupper(*c); c++; } *c=0;
-  if (strstr(name,"REGISTER"))
-    return 0;
-  else return 1;
-}
-
 void game_net_init(int argc, char **argv)
 {
@@ -2642 +2627 @@
         }
 
-        if( !get_option( "-share" ) )
-        {
-                jFILE *fp = new jFILE( "register/micron.vcd", "rb" );
-                if( !fp->open_failure() )
-                {
-                        spec_directory sd( fp );
-                        if( sd.find( "Copyright (C) 1995 Crack dot Com, All Rights reserved" ) )
-                        {
-                                registered = 1;
-                        }
-                }
-                delete fp;
-        }
-
-        verify_file_fun = registered_ok;
-
         jrand_init();
         jrand();                // so compiler doesn't complain
@@ -2729 +2698 @@
                                 current_level=NULL;
                                 
-                                if (!registered)
-                                share_end();
-                                else show_end();
+                                show_end();
                         
                                 the_game->set_state(MENU_STATE);
@@ -2780 +2747 @@
     delete chat;
 
-    if (!registered)
-    show_sell(0);
-    else milli_wait(500);
-
+    milli_wait(500);
 
     if (small_render) { delete small_render; small_render=NULL; }

abuse/trunk/src/innet.cpp

@@ -46 +46 @@
 base_memory_struct local_base;
 net_address *net_server=NULL;
-extern int registered;
 net_protocol *prot=NULL;
 net_socket *comm_sock=NULL,*game_sock=NULL;
@@ -66 +65 @@
         if (!main_net_cfg)
                 main_net_cfg=new net_configuration;
-
-        if (!registered)
-                return 0;
 
         for (i=1;i<argc;i++)
@@ -416 +412 @@
     }
 
-    // maker sure the two games are both registered or unregistered or sync problems
-    // will occur.
-
-    if (reg && !registered)
-    {
-      fprintf(stderr, "%s", symbol_str("net_not_reg"));
-      delete sock; 
-      return 0;
-    } 
-
-    if (!reg && registered)
+    // make sure the server is registered or sync problems will occur
+    if (!reg)
     {
       fprintf(stderr, "%s", symbol_str("server_not_reg"));

abuse/trunk/src/menu.cpp

@@ -34 +34 @@
 jwindow *volume_window=NULL;
 extern int confirm_quit();
-extern int registered;
 
 //percent is 0..256
@@ -643 +642 @@
   ico_button *sell=NULL;
 
-  if (registered && prot)
+  if (prot)
   {
     sell=load_icon(11,ID_NETWORKING,x,y,h,NULL,"ic_networking");

abuse/trunk/src/net/gclient.cpp

@@ -27 +27 @@
 extern base_memory_struct *base;
 extern net_socket *comm_sock,*game_sock;
-extern int registered;
 extern net_protocol *prot;
 extern char lsf[256];

abuse/trunk/src/net/gserver.cpp

@@ -32 +32 @@
 extern base_memory_struct *base;
 extern net_socket *comm_sock,*game_sock;
-extern int registered;
 
 extern net_protocol *prot;
@@ -390 +389 @@
                 }
 
-                uint8_t reg = registered ? 1 : 0;
+                uint8_t reg = 1; // Of course the game is registered
                 if( sock->write( &reg, 1 ) != 1 )
                         return 0;

abuse/trunk/src/net/netdrv.cpp

@@ -469 +469 @@
   // will occur.
 
-  if (reg && !registered())
+  if (!reg)
   {
     fprintf(stderr,
-            "Sorry, this server is running REGISTERED ABUSE and you are not.\n"
-            "Ask the server operator to run with -share option or better yet,\n"
-            "Buy ABUSE, registered net games are more fun because you can fly,\n"
-            "turn invisible and have more weapons to duke it out with\n");
-    delete sock; 
-    return 0;
-  } 
-
-  if (!reg && registered())
-  {
-    fprintf(stderr,
-            "This is server is not running the registered version of abuse, and\n"
+            "This server is not running the registered version of abuse, and\n"
             "you are (thanks!).  So that there are no conflict between the two games\n"
             "please start with the -share option when connecting to this server\n"

abuse/trunk/src/unixnfc.cpp

@@ -59 +59 @@
 net_address *net_server=NULL;
 
-extern int registered;
-
 int net_start() 
 { 
@@ -152 +150 @@
 
 
-  if (write(net_out_fd,&registered,sizeof(registered))!=sizeof(registered))
+  uint8_t reg = 1;
+  if (write(net_out_fd,&reg,sizeof(reg))!=sizeof(reg))
     return 0;