nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	src/files.c
	src/potion.c
	sys/winnt/Makefile.msc

 Changes to be committed:
	modified:   .gitignore
	modified:   DEVEL/hooksdir/nhsub
	modified:   dat/.gitignore
	modified:   dat/opthelp
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   doc/fixes35.0
	modified:   include/context.h
	modified:   include/decl.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/hack.h
	modified:   include/patchlevel.h
	modified:   src/apply.c
	modified:   src/attrib.c
	modified:   src/decl.c
	modified:   src/do.c
	modified:   src/do_name.c
	modified:   src/dothrow.c
	modified:   src/eat.c
	modified:   src/files.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mklev.c
	modified:   src/mondata.c
	modified:   src/monmove.c
	modified:   src/music.c
	modified:   src/options.c
	modified:   src/potion.c
	modified:   src/pray.c
	modified:   src/sit.c
	modified:   src/sp_lev.c
	modified:   src/uhitm.c
	modified:   sys/share/posixregex.c
	modified:   sys/winnt/Makefile.msc
	modified:   util/.gitignore
	modified:   win/win32/vs2010/NetHackW.vcxproj
This commit is contained in:
nhmall
2015-04-14 18:23:48 -04:00
parent 116a4147a7 647a072b62
commit 3d3ee78a0b
38 changed files with 272 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sp_lev.c
View File

@@ -407,7 +407,7 @@ opvar_clone(ov)
case SPOVAR_VARIABLE:
case SPOVAR_STRING:
case SPOVAR_SEL:
tmpov->vardata.str = strdup(ov->vardata.str);
tmpov->vardata.str = dupstr(ov->vardata.str);
break;
default: impossible("Unknown push value type (%i)!", ov->spovartyp);
}
@@ -2677,7 +2677,7 @@ spo_monster(coder)
case SP_M_V_NAME:
if ((OV_typ(parm) == SPOVAR_STRING) &&
!tmpmons.name.str)
tmpmons.name.str = strdup(OV_s(parm));
tmpmons.name.str = dupstr(OV_s(parm));
break;
case SP_M_V_APPEAR:
if ((OV_typ(parm) == SPOVAR_INT) &&
@@ -2685,7 +2685,7 @@ spo_monster(coder)
tmpmons.appear = OV_i(parm);
opvar_free(parm);
OV_pop(parm);
tmpmons.appear_as.str = strdup(OV_s(parm));
tmpmons.appear_as.str = dupstr(OV_s(parm));
}
break;
case SP_M_V_ASLEEP:
@@ -2820,7 +2820,7 @@ spo_object(coder)
case SP_O_V_NAME:
if ((OV_typ(parm) == SPOVAR_STRING) &&
!tmpobj.name.str)
tmpobj.name.str = strdup(OV_s(parm));
tmpobj.name.str = dupstr(OV_s(parm));
break;
case SP_O_V_CORPSENM:
if (OV_typ(parm) == SPOVAR_MONST) {
@@ -3925,7 +3925,7 @@ spo_levregion(coder)
tmplregion->del_islev = OV_i(del_islev);
tmplregion->rtype = OV_i(rtype);
tmplregion->padding = OV_i(padding);
tmplregion->rname.str = strdup(OV_s(rname));
tmplregion->rname.str = dupstr(OV_s(rname));
if(!tmplregion->in_islev) {
get_location(&tmplregion->inarea.x1, &tmplregion->inarea.y1,
@@ -4494,7 +4494,7 @@ spo_var_init(coder)
tmpvar = (struct splev_var *)malloc(sizeof(struct splev_var));
if (!tmpvar) panic("newvar tmpvar alloc");
tmpvar->next = coder->frame->variables;
tmpvar->name = strdup(OV_s(vname));
tmpvar->name = dupstr(OV_s(vname));
coder->frame->variables = tmpvar;
if (OV_i(arraylen) < 0) {