diff --git a/src/deh_soc.c b/src/deh_soc.c index e3f81a938..ed906fa00 100644 --- a/src/deh_soc.c +++ b/src/deh_soc.c @@ -3713,10 +3713,11 @@ void readfollower(MYFILE *f) followers[numfollowers].horzlag = 3*FRACUNIT; followers[numfollowers].vertlag = 6*FRACUNIT; followers[numfollowers].anglelag = 8*FRACUNIT; - followers[numfollowers].bobspeed = (TICRATE*2)*FRACUNIT; + followers[numfollowers].bobspeed = TICRATE*2; followers[numfollowers].bobamp = 4*FRACUNIT; followers[numfollowers].hitconfirmtime = TICRATE; - followers[numfollowers].defaultcolor = SKINCOLOR_GREEN; + followers[numfollowers].defaultcolor = FOLLOWERCOLOR_MATCH; + strcpy(followers[numfollowers].icon, "MISSING"); do { @@ -3750,6 +3751,11 @@ void readfollower(MYFILE *f) strcpy(followers[numfollowers].name, word2); nameset = true; } + else if (fastcmp(word, "ICON")) + { + strlcpy(followers[numfollowers].icon, word2, 8+1); + nameset = true; + } else if (fastcmp(word, "MODE")) { if (word2) diff --git a/src/k_follower.h b/src/k_follower.h index e9854aec2..6618350c6 100644 --- a/src/k_follower.h +++ b/src/k_follower.h @@ -53,6 +53,8 @@ struct follower_t { char skinname[SKINNAMESIZE+1]; // Skin Name. This is what to refer to when asking the commands anything. char name[SKINNAMESIZE+1]; // Name. This is used for the menus. We'll just follow the same rules as skins for this. + char icon[8+1]; // Lump names are only 8 characters. (+1 for \0) + skincolornum_t defaultcolor; // default color for menus. followermode_t mode; // Follower behavior modifier.