From dacb644ae7fda83d71c4a13d29215a0d0fe6e708 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 5 Jun 2001 22:12:28 +0000
Subject: [PATCH] - replace FGBFI::update with fgUpdateProps - switched to
properties for calculating RPM for model selector - no longer includes
bfi.hxx - no longer includes keyboard.hxx
---
src/Main/main.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 49e90a55c..cfb2a382b 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -123,11 +123,10 @@ int objc=0;
#include "version.h"
-#include "bfi.hxx"
#include "fg_init.hxx"
#include "fg_io.hxx"
+#include "fg_props.hxx"
#include "globals.hxx"
-#include "keyboard.hxx"
#include "splash.hxx"
#ifdef macintosh
@@ -314,8 +313,8 @@ void fgInitVisuals( void ) {
// Update all Visuals (redraws anything graphics related)
void fgRenderFrame( void ) {
- // Update the BFI.
- FGBFI::update();
+ // Update the default (kludged) properties.
+ fgUpdateProps();
fgLIGHT *l = &cur_light_params;
static double last_visibility = -9999;
@@ -646,9 +645,10 @@ void fgRenderFrame( void ) {
if (prop_selector != NULL) {
int propsel_mask = 0;
+ double rpm = fgGetDouble("/engines/engine0/rpm");
for (int i = 0; i < acmodel_npropsettings; i++) {
- if (FGBFI::getRPM() >= acmodel_proprpms[i][0] &&
- FGBFI::getRPM() <= acmodel_proprpms[i][1]) {
+ if (rpm >= acmodel_proprpms[i][0] &&
+ rpm <= acmodel_proprpms[i][1]) {
propsel_mask |= 1 << i;
}
}