Subversion Repositories eduke32

Rev

Rev 5031 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5031 Rev 5039
Line 1032... Line 1032...
1032
1032
1033
    g_sp->z = z;
1033
    g_sp->z = z;
1034
    g_sp->zvel = 0;
1034
    g_sp->zvel = 0;
1035
}
1035
}
1036
1036
1037
static int32_t VM_ResetPlayer(int32_t g_p, int32_t g_flags)
1037
static int32_t VM_ResetPlayer(int32_t g_p, int32_t g_flags, int32_t flags)
1038
{
1038
{
1039
    //AddLog("resetplayer");
1039
    //AddLog("resetplayer");
1040
    if (!g_netServer && ud.multimode < 2)
1040
    if (!g_netServer && ud.multimode < 2)
1041
    {
1041
    {
1042
        if (g_lastSaveSlot >= 0 && ud.recstat != 2)
1042
        if (g_lastSaveSlot >= 0 && ud.recstat != 2 && !(flags & 1))
1043
        {
1043
        {
1044
            M_OpenMenu(g_p);
1044
            M_OpenMenu(g_p);
1045
            KB_ClearKeyDown(sc_Space);
1045
            KB_ClearKeyDown(sc_Space);
1046
            I_AdvanceTriggerClear();
1046
            I_AdvanceTriggerClear();
1047
            M_ChangeMenu(MENU_RESETPLAYER);
1047
            M_ChangeMenu(MENU_RESETPLAYER);
Line 3360... Line 3360...
3360
            insptr++;
3360
            insptr++;
3361
            VM_CONDITIONAL(AC_MOVE_ID(vm.g_t) == *insptr);
3361
            VM_CONDITIONAL(AC_MOVE_ID(vm.g_t) == *insptr);
3362
            continue;
3362
            continue;
3363
3363
3364
        case CON_RESETPLAYER:
3364
        case CON_RESETPLAYER:
3365
        {
-
 
3366
            insptr++;
3365
            insptr++;
3367
            vm.g_flags = VM_ResetPlayer(vm.g_p, vm.g_flags);
3366
            vm.g_flags = VM_ResetPlayer(vm.g_p, vm.g_flags, 0);
-
 
3367
            continue;
-
 
3368
-
 
3369
        case CON_RESETPLAYERFLAGS:
3368
        }
3370
            insptr++;
-
 
3371
            vm.g_flags = VM_ResetPlayer(vm.g_p, vm.g_flags, Gv_GetVarX(*insptr++));
3369
        continue;
3372
            continue;
3370
3373
3371
        case CON_IFONWATER:
3374
        case CON_IFONWATER:
3372
            VM_CONDITIONAL(sector[vm.g_sp->sectnum].lotag == ST_1_ABOVE_WATER && klabs(vm.g_sp->z-sector[vm.g_sp->sectnum].floorz) < (32<<8));
3375
            VM_CONDITIONAL(sector[vm.g_sp->sectnum].lotag == ST_1_ABOVE_WATER && klabs(vm.g_sp->z-sector[vm.g_sp->sectnum].floorz) < (32<<8));
3373
            continue;
3376
            continue;
3374
3377
Line 5706... Line 5709...
5706
void VM_FallSprite(int32_t i)
5709
void VM_FallSprite(int32_t i)
5707
{
5710
{
5708
    VM_Fall(i, &sprite[i]);
5711
    VM_Fall(i, &sprite[i]);
5709
}
5712
}
5710
5713
5711
int32_t VM_ResetPlayer2(int32_t snum)
5714
int32_t VM_ResetPlayer2(int32_t snum, int32_t flags)
5712
{
5715
{
5713
    return VM_ResetPlayer(snum, 0);
5716
    return VM_ResetPlayer(snum, 0, flags);
5714
}
5717
}
5715
5718
5716
int32_t VM_CheckSquished2(int32_t i, int32_t snum)
5719
int32_t VM_CheckSquished2(int32_t i, int32_t snum)
5717
{
5720
{
5718
    vm.g_i = i;
5721
    vm.g_i = i;