Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 113224 | Differences between
and this patch

Collapse All | Expand All

(-)nethack-3.4.3-ru.0.3-orig/src/cmd.c (-25 / +24 lines)
Lines 161-174 Link Here
161
#ifdef OVL1
161
#ifdef OVL1
162
162
163
STATIC_PTR int
163
STATIC_PTR int
164
doprev_message(VOID_ARGS)
164
doprev_message()
165
{
165
{
166
    return nh_doprev_message();
166
    return nh_doprev_message();
167
}
167
}
168
168
169
/* Count down by decrementing multi */
169
/* Count down by decrementing multi */
170
STATIC_PTR int
170
STATIC_PTR int
171
timed_occupation(VOID_ARGS)
171
timed_occupation()
172
{
172
{
173
	(*timed_occ_fn)();
173
	(*timed_occ_fn)();
174
	if (multi > 0)
174
	if (multi > 0)
Lines 285-291 Link Here
285
#ifdef OVLB
285
#ifdef OVLB
286
286
287
STATIC_PTR int
287
STATIC_PTR int
288
doextcmd(VOID_ARGS)	/* here after # - now read a full-word command */
288
doextcmd()	/* here after # - now read a full-word command */
289
{
289
{
290
	int idx, retval;
290
	int idx, retval;
291
291
Lines 301-307 Link Here
301
}
301
}
302
302
303
int
303
int
304
doextlist(VOID_ARGS)	/* here after #? - now list all full-word commands */
304
doextlist()	/* here after #? - now list all full-word commands */
305
{
305
{
306
	register const struct ext_func_tab *efp;
306
	register const struct ext_func_tab *efp;
307
	char	 buf[BUFSZ];
307
	char	 buf[BUFSZ];
Lines 447-453 Link Here
447
447
448
/* #monster command - use special monster ability while polymorphed */
448
/* #monster command - use special monster ability while polymorphed */
449
STATIC_PTR int
449
STATIC_PTR int
450
domonability(VOID_ARGS)
450
domonability()
451
{
451
{
452
	if (can_breathe(youmonst.data)) return dobreathe();
452
	if (can_breathe(youmonst.data)) return dobreathe();
453
	else if (attacktype(youmonst.data, AT_SPIT)) return dospit();
453
	else if (attacktype(youmonst.data, AT_SPIT)) return dospit();
Lines 477-483 Link Here
477
}
477
}
478
478
479
STATIC_PTR int
479
STATIC_PTR int
480
enter_explore_mode(VOID_ARGS)
480
enter_explore_mode()
481
{
481
{
482
	if(!discover && !wizard) {
482
	if(!discover && !wizard) {
483
		pline("Âíèìàíèå!  Èç èññëåäîâàòåëüñêîãî ðåæèìà íåëüçÿ âåðíóòüñÿ ê íîðìàëüíîé èãðå.");
483
		pline("Âíèìàíèå!  Èç èññëåäîâàòåëüñêîãî ðåæèìà íåëüçÿ âåðíóòüñÿ ê íîðìàëüíîé èãðå.");
Lines 498-504 Link Here
498
498
499
/* ^W command - wish for something */
499
/* ^W command - wish for something */
500
STATIC_PTR int
500
STATIC_PTR int
501
wiz_wish(VOID_ARGS)	/* Unlimited wishes for debug mode by Paul Polderman */
501
wiz_wish()	/* Unlimited wishes for debug mode by Paul Polderman */
502
{
502
{
503
	if (wizard) {
503
	if (wizard) {
504
	    boolean save_verbose = flags.verbose;
504
	    boolean save_verbose = flags.verbose;
Lines 514-520 Link Here
514
514
515
/* ^I command - identify hero's inventory */
515
/* ^I command - identify hero's inventory */
516
STATIC_PTR int
516
STATIC_PTR int
517
wiz_identify(VOID_ARGS)
517
wiz_identify()
518
{
518
{
519
	if (wizard)	identify_pack(0);
519
	if (wizard)	identify_pack(0);
520
	else		pline("Êîìàíäà '^I' íåäîñòóïíà.");
520
	else		pline("Êîìàíäà '^I' íåäîñòóïíà.");
Lines 523-529 Link Here
523
523
524
/* ^F command - reveal the level map and any traps on it */
524
/* ^F command - reveal the level map and any traps on it */
525
STATIC_PTR int
525
STATIC_PTR int
526
wiz_map(VOID_ARGS)
526
wiz_map()
527
{
527
{
528
	if (wizard) {
528
	if (wizard) {
529
	    struct trap *t;
529
	    struct trap *t;
Lines 545-551 Link Here
545
545
546
/* ^G command - generate monster(s); a count prefix will be honored */
546
/* ^G command - generate monster(s); a count prefix will be honored */
547
STATIC_PTR int
547
STATIC_PTR int
548
wiz_genesis(VOID_ARGS)
548
wiz_genesis()
549
{
549
{
550
	if (wizard)	(void) create_particular();
550
	if (wizard)	(void) create_particular();
551
	else		pline("Êîìàíäà '^G' íåäîñòóïíà.");
551
	else		pline("Êîìàíäà '^G' íåäîñòóïíà.");
Lines 554-560 Link Here
554
554
555
/* ^O command - display dungeon layout */
555
/* ^O command - display dungeon layout */
556
STATIC_PTR int
556
STATIC_PTR int
557
wiz_where(VOID_ARGS)
557
wiz_where()
558
{
558
{
559
	if (wizard) (void) print_dungeon(FALSE, (schar *)0, (xchar *)0);
559
	if (wizard) (void) print_dungeon(FALSE, (schar *)0, (xchar *)0);
560
	else	    pline("Êîìàíäà '^O' íåäîñòóïíà.");
560
	else	    pline("Êîìàíäà '^O' íåäîñòóïíà.");
Lines 563-569 Link Here
563
563
564
/* ^E command - detect unseen (secret doors, traps, hidden monsters) */
564
/* ^E command - detect unseen (secret doors, traps, hidden monsters) */
565
STATIC_PTR int
565
STATIC_PTR int
566
wiz_detect(VOID_ARGS)
566
wiz_detect()
567
{
567
{
568
	if(wizard)  (void) findit();
568
	if(wizard)  (void) findit();
569
	else	    pline("Êîìàíäà '^E' íåäîñòóïíà.");
569
	else	    pline("Êîìàíäà '^E' íåäîñòóïíà.");
Lines 572-578 Link Here
572
572
573
/* ^V command - level teleport */
573
/* ^V command - level teleport */
574
STATIC_PTR int
574
STATIC_PTR int
575
wiz_level_tele(VOID_ARGS)
575
wiz_level_tele()
576
{
576
{
577
	if (wizard)	level_tele();
577
	if (wizard)	level_tele();
578
	else		pline("Êîìàíäà '^V' íåäîñòóïíà.");
578
	else		pline("Êîìàíäà '^V' íåäîñòóïíà.");
Lines 581-587 Link Here
581
581
582
/* #monpolycontrol command - choose new form for shapechangers, polymorphees */
582
/* #monpolycontrol command - choose new form for shapechangers, polymorphees */
583
STATIC_PTR int
583
STATIC_PTR int
584
wiz_mon_polycontrol(VOID_ARGS)
584
wiz_mon_polycontrol()
585
{
585
{
586
    iflags.mon_polycontrol = !iflags.mon_polycontrol;
586
    iflags.mon_polycontrol = !iflags.mon_polycontrol;
587
    pline("Óïðàâëåíèå îáðàùåíèåì ÷óäîâèùà %s.",
587
    pline("Óïðàâëåíèå îáðàùåíèåì ÷óäîâèùà %s.",
Lines 591-597 Link Here
591
591
592
/* #levelchange command - adjust hero's experience level */
592
/* #levelchange command - adjust hero's experience level */
593
STATIC_PTR int
593
STATIC_PTR int
594
wiz_level_change(VOID_ARGS)
594
wiz_level_change()
595
{
595
{
596
    char buf[BUFSZ];
596
    char buf[BUFSZ];
597
    int newlevel;
597
    int newlevel;
Lines 631-637 Link Here
631
631
632
/* #panic command - test program's panic handling */
632
/* #panic command - test program's panic handling */
633
STATIC_PTR int
633
STATIC_PTR int
634
wiz_panic(VOID_ARGS)
634
wiz_panic()
635
{
635
{
636
	if (yn("Òû õî÷åøü âûçâàòü panic() è ïðåêðàòèòü èãðó?") == 'y')
636
	if (yn("Òû õî÷åøü âûçâàòü panic() è ïðåêðàòèòü èãðó?") == 'y')
637
		panic("crash test.");
637
		panic("crash test.");
Lines 640-646 Link Here
640
640
641
/* #polyself command - change hero's form */
641
/* #polyself command - change hero's form */
642
STATIC_PTR int
642
STATIC_PTR int
643
wiz_polyself(VOID_ARGS)
643
wiz_polyself()
644
{
644
{
645
        polyself(TRUE);
645
        polyself(TRUE);
646
        return 0;
646
        return 0;
Lines 648-654 Link Here
648
648
649
/* #seenv command */
649
/* #seenv command */
650
STATIC_PTR int
650
STATIC_PTR int
651
wiz_show_seenv(VOID_ARGS)
651
wiz_show_seenv()
652
{
652
{
653
	winid win;
653
	winid win;
654
	int x, y, v, startx, stopx, curx;
654
	int x, y, v, startx, stopx, curx;
Lines 690-696 Link Here
690
690
691
/* #vision command */
691
/* #vision command */
692
STATIC_PTR int
692
STATIC_PTR int
693
wiz_show_vision(VOID_ARGS)
693
wiz_show_vision()
694
{
694
{
695
	winid win;
695
	winid win;
696
	int x, y, v;
696
	int x, y, v;
Lines 727-733 Link Here
727
727
728
/* #wmode command */
728
/* #wmode command */
729
STATIC_PTR int
729
STATIC_PTR int
730
wiz_show_wmodes(VOID_ARGS)
730
wiz_show_wmodes()
731
{
731
{
732
	winid win;
732
	winid win;
733
	int x,y;
733
	int x,y;
Lines 1232-1238 Link Here
1232
}
1232
}
1233
1233
1234
STATIC_PTR int
1234
STATIC_PTR int
1235
doattributes(VOID_ARGS)
1235
doattributes()
1236
{
1236
{
1237
	if (!minimal_enlightenment())
1237
	if (!minimal_enlightenment())
1238
		return 0;
1238
		return 0;
Lines 1245-1251 Link Here
1245
 * (shares enlightenment's tense handling)
1245
 * (shares enlightenment's tense handling)
1246
 */
1246
 */
1247
STATIC_PTR int
1247
STATIC_PTR int
1248
doconduct(VOID_ARGS)
1248
doconduct()
1249
{
1249
{
1250
	show_conduct(0);
1250
	show_conduct(0);
1251
	return 0;
1251
	return 0;
Lines 1983-1992 Link Here
1983
		if (*cmd >= 040 && *cmd < 0177) {
1983
		if (*cmd >= 040 && *cmd < 0177) {
1984
		    *cp++ = *cmd++;
1984
		    *cp++ = *cmd++;
1985
		} else if (*cmd & 0200) {
1985
		} else if (*cmd & 0200) {
1986
			char c = *cmd++;
1987
		    *cp++ = 'M';
1986
		    *cp++ = 'M';
1988
		    *cp++ = '-';
1987
		    *cp++ = '-';
1989
		    *cp++ = c & ~0200;
1988
		    *cp++ = *cmd++ &= ~0200;
1990
		} else {
1989
		} else {
1991
		    *cp++ = '^';
1990
		    *cp++ = '^';
1992
		    *cp++ = *cmd++ ^ 0100;
1991
		    *cp++ = *cmd++ ^ 0100;
Lines 2449-2455 Link Here
2449
}
2448
}
2450
2449
2451
STATIC_PTR int
2450
STATIC_PTR int
2452
dotravel(VOID_ARGS)
2451
dotravel()
2453
{
2452
{
2454
	/* Keyboard travel command */
2453
	/* Keyboard travel command */
2455
	static char cmd[2];
2454
	static char cmd[2];
(-)nethack-3.4.3-ru.0.3-orig/src/dig.c (-1 / +1 lines)
Lines 208-214 Link Here
208
}
208
}
209
209
210
STATIC_OVL int
210
STATIC_OVL int
211
dig(VOID_ARGS)
211
dig()
212
{
212
{
213
	register struct rm *lev;
213
	register struct rm *lev;
214
	register xchar dpx = digging.pos.x, dpy = digging.pos.y;
214
	register xchar dpx = digging.pos.x, dpy = digging.pos.y;
(-)nethack-3.4.3-ru.0.3-orig/src/do.c (-1 / +1 lines)
Lines 1598-1604 Link Here
1598
#ifdef OVLB
1598
#ifdef OVLB
1599
1599
1600
STATIC_PTR int
1600
STATIC_PTR int
1601
wipeoff(VOID_ARGS)
1601
wipeoff()
1602
{
1602
{
1603
	if(u.ucreamed < 4)	u.ucreamed = 0;
1603
	if(u.ucreamed < 4)	u.ucreamed = 0;
1604
	else			u.ucreamed -= 4;
1604
	else			u.ucreamed -= 4;
(-)nethack-3.4.3-ru.0.3-orig/src/do_wear.c (-15 / +15 lines)
Lines 93-99 Link Here
93
93
94
STATIC_PTR
94
STATIC_PTR
95
int
95
int
96
Boots_on(VOID_ARGS)
96
Boots_on()
97
{
97
{
98
    long oldprop =
98
    long oldprop =
99
	u.uprops[objects[uarmf->otyp].oc_oprop].extrinsic & ~WORN_BOOTS;
99
	u.uprops[objects[uarmf->otyp].oc_oprop].extrinsic & ~WORN_BOOTS;
Lines 140-146 Link Here
140
}
140
}
141
141
142
int
142
int
143
Boots_off(VOID_ARGS)
143
Boots_off()
144
{
144
{
145
    int otyp = uarmf->otyp;
145
    int otyp = uarmf->otyp;
146
    long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_BOOTS;
146
    long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_BOOTS;
Lines 195-201 Link Here
195
}
195
}
196
196
197
STATIC_PTR int
197
STATIC_PTR int
198
Cloak_on(VOID_ARGS)
198
Cloak_on()
199
{
199
{
200
    long oldprop =
200
    long oldprop =
201
	u.uprops[objects[uarmc->otyp].oc_oprop].extrinsic & ~WORN_CLOAK;
201
	u.uprops[objects[uarmc->otyp].oc_oprop].extrinsic & ~WORN_CLOAK;
Lines 244-250 Link Here
244
}
244
}
245
245
246
int
246
int
247
Cloak_off(VOID_ARGS)
247
Cloak_off()
248
{
248
{
249
    int otyp = uarmc->otyp;
249
    int otyp = uarmc->otyp;
250
    long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_CLOAK;
250
    long oldprop = u.uprops[objects[otyp].oc_oprop].extrinsic & ~WORN_CLOAK;
Lines 291-297 Link Here
291
291
292
STATIC_PTR
292
STATIC_PTR
293
int
293
int
294
Helmet_on(VOID_ARGS)
294
Helmet_on()
295
{
295
{
296
    switch(uarmh->otyp) {
296
    switch(uarmh->otyp) {
297
	case FEDORA:
297
	case FEDORA:
Lines 348-354 Link Here
348
}
348
}
349
349
350
int
350
int
351
Helmet_off(VOID_ARGS)
351
Helmet_off()
352
{
352
{
353
    takeoff_mask &= ~W_ARMH;
353
    takeoff_mask &= ~W_ARMH;
354
354
Lines 391-397 Link Here
391
391
392
STATIC_PTR
392
STATIC_PTR
393
int
393
int
394
Gloves_on(VOID_ARGS)
394
Gloves_on()
395
{
395
{
396
    long oldprop =
396
    long oldprop =
397
	u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES;
397
	u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES;
Lines 416-422 Link Here
416
}
416
}
417
417
418
int
418
int
419
Gloves_off(VOID_ARGS)
419
Gloves_off()
420
{
420
{
421
    long oldprop =
421
    long oldprop =
422
	u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES;
422
	u.uprops[objects[uarmg->otyp].oc_oprop].extrinsic & ~WORN_GLOVES;
Lines 472-478 Link Here
472
}
472
}
473
473
474
STATIC_PTR int
474
STATIC_PTR int
475
Shield_on(VOID_ARGS)
475
Shield_on()
476
{
476
{
477
/*
477
/*
478
    switch (uarms->otyp) {
478
    switch (uarms->otyp) {
Lines 491-497 Link Here
491
}
491
}
492
492
493
int
493
int
494
Shield_off(VOID_ARGS)
494
Shield_off()
495
{
495
{
496
    takeoff_mask &= ~W_ARMS;
496
    takeoff_mask &= ~W_ARMS;
497
/*
497
/*
Lines 513-519 Link Here
513
513
514
#ifdef TOURIST
514
#ifdef TOURIST
515
STATIC_PTR int
515
STATIC_PTR int
516
Shirt_on(VOID_ARGS)
516
Shirt_on()
517
{
517
{
518
/*
518
/*
519
    switch (uarmu->otyp) {
519
    switch (uarmu->otyp) {
Lines 527-533 Link Here
527
}
527
}
528
528
529
int
529
int
530
Shirt_off(VOID_ARGS)
530
Shirt_off()
531
{
531
{
532
    takeoff_mask &= ~W_ARMU;
532
    takeoff_mask &= ~W_ARMU;
533
/*
533
/*
Lines 549-561 Link Here
549
 */
549
 */
550
STATIC_PTR
550
STATIC_PTR
551
int
551
int
552
Armor_on(VOID_ARGS)
552
Armor_on()
553
{
553
{
554
    return 0;
554
    return 0;
555
}
555
}
556
556
557
int
557
int
558
Armor_off(VOID_ARGS)
558
Armor_off()
559
{
559
{
560
    takeoff_mask &= ~W_ARM;
560
    takeoff_mask &= ~W_ARM;
561
    setworn((struct obj *)0, W_ARM);
561
    setworn((struct obj *)0, W_ARM);
Lines 1930-1936 Link Here
1930
1930
1931
STATIC_PTR
1931
STATIC_PTR
1932
int
1932
int
1933
take_off(VOID_ARGS)
1933
take_off()
1934
{
1934
{
1935
	register int i;
1935
	register int i;
1936
	register struct obj *otmp;
1936
	register struct obj *otmp;
(-)nethack-3.4.3-ru.0.3-orig/src/eat.c (-5 / +5 lines)
Lines 179-185 Link Here
179
179
180
STATIC_PTR
180
STATIC_PTR
181
int
181
int
182
eatmdone(VOID_ARGS)		/* called after mimicing is over */
182
eatmdone()		/* called after mimicing is over */
183
{
183
{
184
	/* release `eatmbuf' */
184
	/* release `eatmbuf' */
185
	if (eatmbuf) {
185
	if (eatmbuf) {
Lines 396-402 Link Here
396
396
397
STATIC_PTR
397
STATIC_PTR
398
int
398
int
399
eatfood(VOID_ARGS)		/* called each move during eating process */
399
eatfood()		/* called each move during eating process */
400
{
400
{
401
	if(!victual.piece ||
401
	if(!victual.piece ||
402
	 (!carried(victual.piece) && !obj_here(victual.piece, u.ux, u.uy))) {
402
	 (!carried(victual.piece) && !obj_here(victual.piece, u.ux, u.uy))) {
Lines 1014-1020 Link Here
1014
1014
1015
STATIC_PTR
1015
STATIC_PTR
1016
int
1016
int
1017
opentin(VOID_ARGS)		/* called during each move whilst opening a tin */
1017
opentin()		/* called during each move whilst opening a tin */
1018
{
1018
{
1019
	register int r;
1019
	register int r;
1020
	const char *what;
1020
	const char *what;
Lines 1190-1196 Link Here
1190
}
1190
}
1191
1191
1192
int
1192
int
1193
Hear_again(VOID_ARGS)		/* called when waking up after fainting */
1193
Hear_again()		/* called when waking up after fainting */
1194
{
1194
{
1195
	flags.soundok = 1;
1195
	flags.soundok = 1;
1196
	return 0;
1196
	return 0;
Lines 2223-2229 Link Here
2223
2223
2224
STATIC_PTR
2224
STATIC_PTR
2225
int
2225
int
2226
unfaint(VOID_ARGS)
2226
unfaint()
2227
{
2227
{
2228
	(void) Hear_again();
2228
	(void) Hear_again();
2229
	if(u.uhs > FAINTING)
2229
	if(u.uhs > FAINTING)
(-)nethack-3.4.3-ru.0.3-orig/src/lock.c (-2 / +2 lines)
Lines 74-80 Link Here
74
74
75
STATIC_PTR
75
STATIC_PTR
76
int
76
int
77
picklock(VOID_ARGS)	/* try to open/close a lock */
77
picklock()	/* try to open/close a lock */
78
{
78
{
79
79
80
	if (xlock.box) {
80
	if (xlock.box) {
Lines 129-135 Link Here
129
129
130
STATIC_PTR
130
STATIC_PTR
131
int
131
int
132
forcelock(VOID_ARGS)	/* try to force a locked chest */
132
forcelock()	/* try to force a locked chest */
133
{
133
{
134
134
135
	register struct obj *otmp;
135
	register struct obj *otmp;
(-)nethack-3.4.3-ru.0.3-orig/src/spell.c (-1 / +1 lines)
Lines 314-320 Link Here
314
}
314
}
315
315
316
STATIC_PTR int
316
STATIC_PTR int
317
learn(VOID_ARGS)
317
learn()
318
{
318
{
319
	int i;
319
	int i;
320
	short booktype;
320
	short booktype;
(-)nethack-3.4.3-ru.0.3-orig/src/steal.c (-1 / +1 lines)
Lines 144-150 Link Here
144
unsigned int stealmid;		/* monster doing the stealing */
144
unsigned int stealmid;		/* monster doing the stealing */
145
145
146
STATIC_PTR int
146
STATIC_PTR int
147
stealarm(VOID_ARGS)
147
stealarm()
148
{
148
{
149
	register struct monst *mtmp;
149
	register struct monst *mtmp;
150
	register struct obj *otmp;
150
	register struct obj *otmp;

Return to bug 113224