Early Roguelike Collection: srogue/encumb.c annotate

annotate srogue/encumb.c @ 304:e52a8a7ad4c5

Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.

author	John "Elwin" Edwards
date	Wed, 14 Apr 2021 18:55:33 -0400
parents	94a0d9dd5ce1
children

rev	line source
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	1 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	2 * Stuff to do with encumberence
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	3 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	4 * @(#)encumb.c 9.0 (rdk) 7/17/84
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	5 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	6 * Super-Rogue
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	7 * Copyright (C) 1984 Robert D. Kindelberger
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	8 * All rights reserved.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	9 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	10 * See the file LICENSE.TXT for full copyright and licensing information.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	11 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	12
217 94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	13 #include <string.h>
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	14 #include "rogue.h"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	15 #include "rogue.ext"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	16
217 94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	17 int packweight(void);
94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	18 int pack_vol(void);
94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	19
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	20 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	21 * updpack:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	22 * Update his pack weight and adjust fooduse accordingly
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	23 */
217 94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	24 void
94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	25 updpack(void)
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	26 {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	27 reg int topcarry, curcarry;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	28
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	29 him->s_carry = totalenc(); /* get total encumb */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	30 curcarry = packweight(); /* get pack weight */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	31 topcarry = him->s_carry / 5; /* 20% of total carry */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	32 if (curcarry > 4 * topcarry) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	33 if (rnd(100) < 80)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	34 foodlev = 3; /* > 80% of pack */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	35 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	36 else if (curcarry > 3 * topcarry) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	37 if (rnd(100) < 60)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	38 foodlev = 2; /* > 60% of pack */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	39 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	40 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	41 foodlev = 1; /* <= 60% of pack */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	42 him->s_pack = curcarry; /* update pack weight */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	43 packvol = pack_vol(); /* update pack volume */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	44 nochange = FALSE; /* also change display */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	45 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	46
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	47
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	48 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	49 * packweight:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	50 * Get the total weight of the hero's pack
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	51 */
217 94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	52 int
94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	53 packweight(void)
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	54 {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	55 reg struct object *obj;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	56 reg struct linked_list *pc;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	57 reg int weight, i;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	58
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	59 weight = 0;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	60 for (pc = pack ; pc != NULL ; pc = next(pc)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	61 obj = OBJPTR(pc);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	62 weight += itemweight(obj) * obj->o_count;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	63 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	64 if (weight < 0) /* in case of amulet */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	65 weight = 0;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	66 for (i = LEFT; i <= RIGHT; i += 1) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	67 obj = cur_ring[i];
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	68 if (obj != NULL) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	69 if (obj->o_type == R_HEAVY && o_off(obj, ISBLESS))
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	70 weight += weight / 4;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	71 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	72 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	73 return weight;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	74 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	75
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	76
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	77 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	78 * itemweight:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	79 * Get the weight of an object
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	80 */
217 94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	81 int
94a0d9dd5ce1 Super-Rogue: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 36 diff changeset	82 itemweight(struct object *wh)
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	83 {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	84 reg int weight;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	85
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	86 weight = wh->o_weight; /* get base weight */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	87 switch (wh->o_type) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	88 case ARMOR:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	89 if ((armors[wh->o_which].a_class - wh->o_ac) > 0)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	90 weight /= 2;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	91 when WEAPON:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	92 if ((wh->o_hplus + wh->o_dplus) > 0)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	93 weight /= 2;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	94 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	95 if (o_on(wh,ISCURSED))
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	96 weight += weight / 5; /* 20% more for cursed */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	97 if (o_on(wh, ISBLESS))
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	98 weight -= weight / 5; /* 20% less for blessed */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	99 return weight;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	100 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	101
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	102 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff

Mercurial > hg > early-roguelike

annotate srogue/encumb.c @ 304:e52a8a7ad4c5