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

Comparing deliantra/server/server/player.c (file contents):
Revision 1.7 by elmex, Wed Mar 15 15:35:52 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.7 2006/03/15 15:35:52 elmex Exp $";
+ *   "$Id: player.c,v 1.21 2006/08/11 23:04:50 elmex Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
         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;
     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.
     }
     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;
 	 * 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(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");
     /* 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");
 	    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.7 by elmex, Wed Mar 15 15:35:52 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.7 by elmex, Wed Mar 15 15:35:52 2006 UTC vs.
Revision 1.21 by elmex, Fri Aug 11 23:04:50 2006 UTC