← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_TimeEventManager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2005-11-06 12:40:03 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051106124003-3pgs7tcg5rox96xg
Tags: 2.37a-1.1
http://bugs.debian.org/333958
* Non-maintainer upload.
* Split out parts of 01_SConstruct_debian.dpatch again: root_build_dir
  really needs to get adjusted before the clean target runs - closes: #333958,
  see #288882 for reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/GameLogic/SCA_TimeEventManager.cpp
1
1
/**
2
 
 * $Id: SCA_TimeEventManager.cpp,v 1.4 2004/03/22 22:01:33 jesterking Exp $
 
2
 * $Id: SCA_TimeEventManager.cpp,v 1.5 2004/10/16 11:41:48 kester Exp $
3
3
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
4
4
 *
5
5
 * This program is free software; you can redistribute it and/or
70
70
 
71
71
 
72
72
 
73
 
void SCA_TimeEventManager::NextFrame(double curtime,double deltatime)
 
73
void SCA_TimeEventManager::NextFrame(double curtime, double fixedtime)
74
74
{
75
 
        if (m_timevalues.size() > 0)
 
75
        if (m_timevalues.size() > 0 && fixedtime > 0.0)
76
76
        {
77
77
                CFloatValue* floatval = new CFloatValue(curtime);
78
78
                
80
80
                for (vector<CValue*>::iterator it = m_timevalues.begin();
81
81
                !(it == m_timevalues.end()); it++)
82
82
                {
83
 
                        float newtime = (*it)->GetNumber() + deltatime;
 
83
                        float newtime = (*it)->GetNumber() + fixedtime;
84
84
                        floatval->SetFloat(newtime);
85
85
                        (*it)->SetValue(floatval);
86
86
                }