[ViewVC] Diff of: cvs/deliantra/server/server/player.c

Comparing deliantra/server/server/player.c (file contents):
Revision 1.3 by root, Wed Feb 8 04:32:19 2006 UTC vs.
Revision 1.21 by elmex, Fri Aug 11 23:04:50 2006 UTC

 /*
  * static char *rcsid_player_c =
- *   "$Id: player.c,v 1.3 2006/02/08 04:32:19 root Exp $";
+ *   "$Id: player.c,v 1.21 2006/08/11 23:04:50 elmex Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
 #include <object.h>
 #include <spells.h>
 #include <skills.h>
 #include <newclient.h>
+#ifdef COZY_SERVER
 extern int same_party (partylist *a, partylist *b);
+#endif
 player *find_player(const char *plname)
 {
   player *pl;
   for(pl=first_player;pl!=NULL;pl=pl->next)
             }
         }
     return found;
     }
-void display_motd(object *op) {
+void display_motd(const object *op) {
     char buf[MAX_BUF];
     char motd[HUGE_BUF];
     FILE *fp;
     int comp;
     int size;
     }
     draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
     close_and_delete(fp, comp);
 }
-void send_rules(object *op) {
+void send_rules(const object *op) {
     char buf[MAX_BUF];
     char rules[HUGE_BUF];
     FILE *fp;
     int comp;
     int size;
     }
     draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
     close_and_delete(fp, comp);
 }
-void send_news(object *op) {
+void send_news(const object *op) {
     char buf[MAX_BUF];
     char news[HUGE_BUF];
     char subject[MAX_BUF];
     FILE *fp;
     int comp;
         continue;
       if ( *buf =='%'){ /* send one news */
           if (size>0)
               draw_ext_info_format(NDI_UNIQUE | NDI_GREEN, 0, op,
                   MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
-                  "!! informations: %s\n%s",
+                  "INFORMATION: %s\n%s",
                   "%s\n%s",
                   subject, news); /*send previously read news*/
           strcpy(subject,buf+1);
           strip_endline(subject);
           size=0;
       }
     }
     draw_ext_info_format(NDI_UNIQUE | NDI_GREEN, 0, op,
         MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
-        "!! informations: %s\n%s\n",
+        "INFORMATION: %s\n%s\n",
         "%s\n%s",
         subject, news);
     close_and_delete(fp, comp);
 }
     }
     /* Clears basically the entire player structure except
      * for next and socket.
      */
-    memset((void*)((char*)p + offsetof(player, maplevel)), 0,
+    memset((void*)((char*)p + offsetof(player, ob)), 0,
-	    sizeof(player) - offsetof(player, maplevel));
+	    sizeof(player) - offsetof(player, ob));
     /* There are some elements we want initialized to non zero value -
      * we deal with that below this point.
      */
     p->party=NULL;
     op->speed_left=0.5;
     op->speed=1.0;
     op->direction=5;     /* So player faces south */
     op->stats.wc=2;
     op->run_away = 25; /* Then we panick... */
+    p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
     roll_stats(op);
     p->state=ST_ROLL_STAT;
     clear_los(op);
     p->gen_sp_armour=10;
     p->last_speed= -1;
     p->shoottype=range_none;
     p->bowtype=bow_normal;
     p->petmode=pet_normal;
-    p->listening=9;
+    p->listening=10;
+    p->usekeys=containers;
     p->last_weapon_sp= -1;
     p->peaceful=1;			/* default peaceful */
     p->do_los=1;
     p->explore=0;
 	p->no_shout=0;			/* default can shout */
 int add_player(NewSocket *ns) {
     player *p;
     p=get_player(NULL);
-    memcpy(&p->socket, ns, sizeof(NewSocket));
+    p->socket = *ns;
     p->socket.faces_sent = malloc(p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));
     if(p->socket.faces_sent == NULL)
 	fatal(OUT_OF_MEMORY);
     memcpy(p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));
     /* Needed because the socket we just copied over needs to be cleared.
 	mflags = get_map_flags(m, &m, x, y, &x, &y);
 	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK(m, x, y);
 	/* Space is blocked - try changing direction a little */
-	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK(mon, blocked))
+	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK(mon, blocked) || (mflags&P_BLOCKSVIEW))
 	   && (m == mon->map && blocked_link(mon, m, x, y)))) {
 	    /* recalculate direction from last good location.  Possible
 	     * we were not traversing ideal location before.
 	     */
 	    get_rangevector_from_mapcoord(lastmap, lastx, lasty, pl, &rv, 0);
 		    m = lastmap;
 		    mflags = get_map_flags(m, &m, x, y, &x, &y);
 		    if (mflags & P_OUT_OF_MAP) continue;
 		    blocked = GET_MAP_MOVE_BLOCK(m, x, y);
 		    if (OB_TYPE_MOVE_BLOCK(mon, blocked)) continue;
+                    if (mflags & P_BLOCKSVIEW) continue;
 		    if (m == mon->map && blocked_link(mon, m, x, y)) break;
 		}
 		/* go through entire loop without finding a valid
 		 * sidestep to take - thus, no valid path.
 	if(op->type==SPELL)  {
 	    remove_ob(op);
 	    free_object(op);
             continue;
 	}
-	if(op->type==SKILL)  {
+	else if(op->type==SKILL)  {
 	    SET_FLAG(op, FLAG_CAN_USE_SKILL);
 	    op->stats.exp = 0;
 	    op->level = 1;
 	}
+	/* lock all 'normal items by default */
+	else SET_FLAG(op, FLAG_INV_LOCKED);
     } /* for loop of objects in player inv */
     /* Need to set up the skill pointers */
     link_player_skills(pl);
 }
     }
     return 0;
 }
 /* This function takes the key that is passed, and does the
- * appropriate action with it (change class, or other things.
+ * appropriate action with it (change race, or other things).
+ * The function name is for historical reasons - now we have
+ * separate race and class; this actually changes the RACE,
+ * not the class.
  */
 int key_change_class(object *op, char key)
 {
-      int tmp_loop;
+    int tmp_loop;
     if(key=='q'||key=='Q') {
       remove_ob(op);
       play_again(op);
       return 0;
 	CLEAR_FLAG(op, FLAG_WIZ);
 	give_initial_items(op,op->randomitems);
 	link_player_skills(op);
 	esrv_send_inventory(op, op);
 	fix_player(op);
+        /* This moves the player to a different start map, if there
+         * is one for this race
+         */
+        if(*first_map_ext_path) {
+            object *tmp;
+            mapstruct *oldmap = op->map;
+            char mapname[MAX_BUF];
+            snprintf(mapname, MAX_BUF-1, "%s/%s",
+                     first_map_ext_path, op->arch->name);
+            tmp=get_object();
+            EXIT_PATH(tmp) = add_string(mapname);
+            EXIT_X(tmp) = op->x;
+            EXIT_Y(tmp) = op->y;
+            enter_exit(op,tmp); /* we don't really care if it succeeded;
+                                 * if the map isn't there, then stay on the
+                                 * default initial map */
+            free_object(tmp);
+        } else {
+            LOG(llevDebug,"first_map_ext_path not set\n");
+        }
 	return 0;
     }
-    /* Following actually changes the class - this is the default command
+    /* Following actually changes the race - this is the default command
      * if we don't match with one of the options above.
      */
     tmp_loop = 0;
     while(!tmp_loop) {
 	insert_ob_in_map (op, op->map, op,0);
 	strncpy(op->contr->title, op->arch->clone.name, sizeof(op->contr->title)-1);
 	op->contr->title[sizeof(op->contr->title)-1] = '\0';
 	add_statbonus(op);
 	tmp_loop=allowed_class(op);
+        if (!strncmp (op->msg, "Edit me", 7)) tmp_loop = 0; // pippijn fucked it up //D//TODO
     }
     update_object(op,UP_OBJ_FACE);
     esrv_update_item(UPD_FACE,op,op);
     fix_player(op);
     op->stats.hp=op->stats.maxhp;
  * going to try and move (not fire weapons).
  */
 void move_player_attack(object *op, int dir)
 {
-    object *tmp, *mon;
+    object *tmp, *mon, *tpl;
-    sint16 nx=freearr_x[dir]+op->x,ny=freearr_y[dir]+op->y;
+    sint16 nx, ny;
     int on_battleground;
     mapstruct *m;
+    if (op->contr->transport) tpl = op->contr->transport;
+    else tpl = op;
+    nx=freearr_x[dir]+tpl->x;
+    ny=freearr_y[dir]+tpl->y;
-    on_battleground = op_on_battleground(op, NULL, NULL);
+    on_battleground = op_on_battleground(tpl, NULL, NULL);
     /* If braced, or can't move to the square, and it is not out of the
      * map, attack it.  Note order of if statement is important - don't
      * want to be calling move_ob if braced, because move_ob will move the
      * player.  This is a pretty nasty hack, because if we could
      * move to some space, it then means that if we are braced, we should
      * do nothing at all.  As it is, if we are braced, we go through
      * quite a bit of processing.  However, it probably is less than what
      * move_ob uses.
      */
-    if ((op->contr->braced || !move_ob(op,dir,op)) && !out_of_map(op->map,nx,ny)) {
+    if ((op->contr->braced || !move_ob(tpl,dir,tpl)) && !out_of_map(tpl->map,nx,ny)) {
-	if (OUT_OF_REAL_MAP(op->map, nx, ny)) {
+	if (OUT_OF_REAL_MAP(tpl->map, nx, ny)) {
-	    m = get_map_from_coord(op->map, &nx, &ny);
+	    m = get_map_from_coord(tpl->map, &nx, &ny);
 	    if (!m) return; /* Don't think this should happen */
 	}
-	else m =op->map;
+	else m =tpl->map;
 	if ((tmp=get_map_ob(m,nx,ny))==NULL) {
 	    /*	LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n");*/
 	    return;
 	}
 	/* If the creature is a pet, push it even if the player is not
 	 * peaceful.  Our assumption is the creature is a pet if the
 	 * player owns it and it is either friendly or unagressive.
 	 */
 	if ((op->type==PLAYER)
+#if COZY_SERVER
             &&
             (
                (get_owner(mon) && get_owner(mon)->contr
                 && same_party (get_owner(mon)->contr->party, op->contr->party))
                || get_owner(mon) == op
             )
+#else
+            && get_owner(mon)==op
+#endif
             && (QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) ||  QUERY_FLAG(mon, FLAG_FRIENDLY)))
 	{
 	    /* If we're braced, we don't want to switch places with it */
 	    if (op->contr->braced) return;
-	    play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);
+	    play_sound_map(tpl->map, tpl->x, tpl->y, SOUND_PUSH_PLAYER);
 	    (void) push_ob(mon,dir,op);
 	    if(op->contr->tmp_invis||op->hide) make_visible(op);
 	    return;
 	}
 	 * someone, but put it inside this loop so that you won't
 	 * attack them either.
 	 */
 	if ((mon->type==PLAYER || mon->enemy != op) &&
 	    (mon->type==PLAYER || QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)) &&
-	    (op->contr->peaceful && !on_battleground)) {
+            (
+#ifdef PROHIBIT_PLAYERKILL
+             (op->contr->peaceful || (mon->type == PLAYER && mon->contr->peaceful)) &&
+#else
+             op->contr->peaceful &&
+#endif
+             !on_battleground
+           )) {
 	    if (!op->contr->braced) {
-		play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);
+		play_sound_map(tpl->map, tpl->x, tpl->y, SOUND_PUSH_PLAYER);
 		(void) push_ob(mon,dir,op);
 	    } else {
 		new_draw_info(0, 0,op,"You withhold your attack");
 	    }
 	    if(op->contr->tmp_invis||op->hide) make_visible(op);
     } /* if player should attack something */
 }
 int move_player(object *op,int dir) {
     int pick;
+    object *transport = op->contr->transport;
-    if(op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)
+    if(!transport && (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY))
 	return 0;
     /* Sanity check: make sure dir is valid */
     if ( ( dir < 0 ) || ( dir >= 9 ) ) {
         LOG( llevError, "move_player: invalid direction %d\n", dir);
     if(QUERY_FLAG(op,FLAG_CONFUSED) && dir)
 	dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2);
     op->facing = dir;
-    if(op->hide) do_hidden_move(op);
+    if(!transport && op->hide) do_hidden_move(op);
+    if (transport) {
+	/* transport->contr is set up for the person in charge of the boat.
+	 * if that isn't this person, he can't steer it, etc
+	 */
+	if (transport->contr != op->contr) return 0;
+	/* Transport can't move.  But update dir so it at least
+	 * will point in the same direction if player is running.
+	 */
+	if (transport->speed_left < 0.0) {
+	    transport->direction = dir;
+	    op->direction = dir;
+	    return 0;
+	}
+	/* Remove transport speed.  Give player just a little speed -
+	 * enough so that they will get an action again quickly.
+	 *
+	 */
+	transport->speed_left -= 1.0;
+	if (op->speed_left < 0.0) op->speed_left = -0.01;
+    }
     if(op->contr->fire_on) {
 	fire(op,dir);
     }
     else move_player_attack(op,dir);
     }
     /* Update how the player looks.  Use the facing, so direction may
      * get reset to zero.  This allows for full animation capabilities
      * for players.
      */
-    animate_object(op, op->facing);
+    if (!transport) animate_object(op, op->facing);
     return 0;
 }
 /* This is similar to handle_player, below, but is only used by the
  * new client/server stuff.
  */
 int handle_newcs_player(object *op)
 {
     if (op->contr->hidden) {
 	op->invisible = 1000;
-	/* the socket code flasehs the player visible/invisible
+	/* the socket code flashes the player visible/invisible
-	 * depending on the value if invisible, so we need to
+	 * depending on the value of invisible, so we need to
 	 * alternate it here for it to work correctly.
 	 */
 	if (pticks & 2) op->invisible--;
     }
     else if(op->invisible&&!(QUERY_FLAG(op,FLAG_MAKE_INVIS))) {
       }
     }
     /* Digestion */
     if(--op->last_eat<0) {
+#ifdef COZY_SERVER
       int dg = op->contr->digestion>=0 && op->contr->digestion<2 ? 2 : op->contr->digestion;
       int bonus=dg>0?dg:0,
 	penalty=dg<0?-dg:0;
+#else
+      int bonus=op->contr->digestion>0?op->contr->digestion:0,
+      penalty=op->contr->digestion<0?-op->contr->digestion:0;
+#endif
       if(op->contr->gen_hp > 0)
 	op->last_eat=25*(1+bonus)/(op->contr->gen_hp+penalty+1);
       else
 	op->last_eat=25*(1+bonus)/(penalty +1);
     /* dms do not consume food */
     /* Lauwenmark: Handle for plugin death event */
     if (execute_event(op, EVENT_DEATH,NULL,NULL,NULL,SCRIPT_FIX_ALL) != 0)
             return;
+    command_kill_pets (op, 0);
     /* Lauwenmark: Handle for the global death event */
         execute_global_event(EVENT_PLAYER_DEATH, op);
     if(op->stats.food<0) {
 	if (op->contr->explore) {
 	    new_draw_info(NDI_UNIQUE, 0,op,"You would have starved, but you are");
 	/* Basically two ways to go - remove a stat permanently, or just
 	 * make it depletion.  This bunch of code deals with that aspect
 	 * of death.
 	 */
-#if 0
+#ifndef COZY_SERVER
 	if (settings.balanced_stat_loss) {
 	    /* If stat loss is permanent, lose one stat only. */
 	    /* Lower level chars don't lose as many stats because they suffer
 	       more if they do. */
 	    /* Higher level characters can afford things such as potions of
 	    num_stats_lose = 1;
 	}
 	lost_a_stat = 0;
 	for (z=0; z<num_stats_lose; z++) {
+	    i = RANDOM() % NUM_STATS;
 	    if (settings.stat_loss_on_death) {
 		/* Pick a random stat and take a point off it.  Tell the player
 		 * what he lost.
 		 */
-		i = RANDOM() % 7;
 		change_attr_value(&(op->stats), i,-1);
 		check_stat_bounds(&(op->stats));
 		change_attr_value(&(op->contr->orig_stats), i,-1);
 		check_stat_bounds(&(op->contr->orig_stats));
 		new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);
 	    } else {
 		/* deplete a stat */
 		archetype *deparch=find_archetype("depletion");
 		object *dep;
-		i = RANDOM() % 7;
 		dep = present_arch_in_ob(deparch,op);
 		if(!dep) {
 		    dep = arch_to_object(deparch);
 		    insert_ob_in_ob(dep, op);
 		}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/player.c (file contents): Revision 1.3 by root, Wed Feb 8 04:32:19 2006 UTC vs. Revision 1.21 by elmex, Fri Aug 11 23:04:50 2006 UTC

Diff Legend

Comparing deliantra/server/server/player.c (file contents):
Revision 1.3 by root, Wed Feb 8 04:32:19 2006 UTC vs.
Revision 1.21 by elmex, Fri Aug 11 23:04:50 2006 UTC