Changeset 942 for trunk

Show
Ignore:
Timestamp:
03/07/2008 04:41:53 (5 months ago)
Author:
james
Message:

use proper array initialisation, now I know how!
reindent

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/modules/plugins.tcl

    r937 r942  
    2323## Simple plugins 
    2424if [info exists bMotion_plugins_simple] { unset bMotion_plugins_simple } 
    25 set bMotion_plugins_simple(dummy) "_{100,100}Š0Š/has a tremendous plugin-related error (wahey)$" 
     25array set bMotion_plugins_simple {} 
    2626 
    2727## Admin plugins (.bmotion) 
    2828if [info exists bMotion_plugins_admin] { unset bMotion_plugins_admin } 
    29 set bMotion_plugins_admin(dummy) "none" 
     29array set bMotion_plugins_admin {} 
    3030 
    3131## complex plugins 
    3232if [info exists bMotion_plugins_complex] { unset bMotion_plugins_complex } 
    33 set bMotion_plugins_complex(dummy) "none" 
     33array set bMotion_plugins_complex {} 
    3434 
    3535## output plugins 
    3636if [info exists bMotion_plugins_output] { unset bMotion_plugins_output } 
    37 set bMotion_plugins_output(dummy) "none" 
     37array set bMotion_plugins_output {} 
    3838 
    3939## action simple plugins 
    4040if [info exists bMotion_plugins_action_simple] { unset bMotion_plugins_action_simple } 
    41 set bMotion_plugins_action_simple(dummy) "none" 
     41array set bMotion_plugins_action_simple {} 
    4242 
    4343## action complex plugins 
    4444if [info exists bMotion_plugins_action_complex] { unset bMotion_plugins_action_complex } 
    45 set bMotion_plugins_action_complex(dummy) "none" 
     45array set bMotion_plugins_action_complex {} 
    4646 
    4747## irc_event plugins 
    4848if [info exists bMotion_plugins_irc_event] { unset bMotion_plugins_irc_event } 
    49 set bMotion_plugins_irc_event(dummy) "none" 
     49array set bMotion_plugins_irc_event {} 
    5050 
    5151## management plugins 
    5252if [info exists bMotion_plugins_management] { unset bMotion_plugins_management } 
    53 set bMotion_plugins_management(dummy) "none" 
     53array set bMotion_plugins_management {} 
    5454 
    5555############################################################################################################################## 
  • trunk/plugins/complex.tcl

    r744 r942  
    11## bMotion plugins loader: complex 
    2 # 
    3 # $Id$ 
    42# 
    53 
    64############################################################################### 
    7 # This is a bMotion plugin 
    8 # Copyright (C) James Michael Seward 2000-2002 
     5# This is a bMotion module 
     6# Copyright (C) James Michael Seward 2000-2008 
    97# 
    108# This program is covered by the GPL, please refer the to LICENCE file in the 
     
    1513set currentlang $bMotionInfo(language) 
    1614set languages [split $bMotionSettings(languages) ","] 
     15 
    1716foreach bMotion_language $languages { 
    18   set bMotionInfo(language) $bMotion_language 
    19   bMotion_putloglev 2 * "bMotion: loading complex plugins language = $bMotion_language" 
    20   set files [glob -nocomplain "$bMotionPlugins/$bMotion_language/complex_*.tcl"] 
    21   foreach f $files { 
     17        set bMotionInfo(language) $bMotion_language 
     18        bMotion_putloglev 2 * "bMotion: loading complex plugins language = $bMotion_language" 
     19        set files [glob -nocomplain "$bMotionPlugins/$bMotion_language/complex_*.tcl"] 
     20 
     21        foreach f $files { 
    2222                set count [llength [array names bMotion_plugins_complex]] 
    2323                set bMotion_noplugins 0 
    24     bMotion_putloglev 1 * "bMotion: loading ($bMotion_language) complex plugin file $f" 
    25     catch { 
    26       source $f 
    27     } err 
     24                bMotion_putloglev 1 * "bMotion: loading ($bMotion_language) complex plugin file $f" 
     25                catch { 
     26                        source $f 
     27                } err 
    2828                set newcount [llength [array names bMotion_plugins_complex]] 
    2929                if {($bMotion_testing == 0) && ($newcount == $count) && ($bMotion_noplugins == 0)} { 
     
    3131                        putlog "Possible error: $err" 
    3232                } 
    33   } 
     33        } 
    3434} 
     35 
    3536set bMotionInfo(language) $currentlang 
    3637unset currentlang